diff options
| author | Paul Eggert | 2016-05-09 10:59:29 -0700 |
|---|---|---|
| committer | Paul Eggert | 2016-05-09 10:59:29 -0700 |
| commit | c8b7a6abd90aab76185202def7049a0ea981d335 (patch) | |
| tree | abd2edd93ad2fdd4e31e25a0e0ce1c24adde62ff /src/process.c | |
| parent | 9418ab39bf970dd82b5d6f2e7b40a5d8cd134a43 (diff) | |
| parent | 3b478989df59cc33886d260137c433da5cfe4863 (diff) | |
| download | emacs-c8b7a6abd90aab76185202def7049a0ea981d335.tar.gz emacs-c8b7a6abd90aab76185202def7049a0ea981d335.zip | |
Merge from origin/emacs-25
3b47898 Fix doc string in `insert'
b479dea * doc/misc/emacs-mime.texi (time-date): Document now-builtins...
cd27f73 Say 'All results processed' at the end
4ffec91 Document automatic adjustment of process' logical window dime...
dc66271 ; Fix typos and stylistic glitches in NEWS
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/process.c b/src/process.c index 2d0fb567943..3e66949b690 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -1134,7 +1134,9 @@ See `set-process-sentinel' for more info on sentinels. */) | |||
| 1134 | 1134 | ||
| 1135 | DEFUN ("set-process-window-size", Fset_process_window_size, | 1135 | DEFUN ("set-process-window-size", Fset_process_window_size, |
| 1136 | Sset_process_window_size, 3, 3, 0, | 1136 | Sset_process_window_size, 3, 3, 0, |
| 1137 | doc: /* Tell PROCESS that it has logical window size HEIGHT and WIDTH. */) | 1137 | doc: /* Tell PROCESS that it has logical window size WIDTH by HEIGHT. |
| 1138 | Value is t if PROCESS was successfully told about the window size, | ||
| 1139 | nil otherwise. */) | ||
| 1138 | (Lisp_Object process, Lisp_Object height, Lisp_Object width) | 1140 | (Lisp_Object process, Lisp_Object height, Lisp_Object width) |
| 1139 | { | 1141 | { |
| 1140 | CHECK_PROCESS (process); | 1142 | CHECK_PROCESS (process); |