diff options
| author | Paul Eggert | 2011-06-20 17:59:02 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-06-20 17:59:02 -0700 |
| commit | 51cab52b054aaf178743aa7775ae29e934eeba9c (patch) | |
| tree | 0160ac7e20237f3a337fc35c9ba368762ef9203c /src/process.c | |
| parent | 171e2a582e4c7d6bfd6d6ff0373720b59568bcb2 (diff) | |
| parent | ca5307394f6861fc825434c268e0a44adf8a3252 (diff) | |
| download | emacs-51cab52b054aaf178743aa7775ae29e934eeba9c.tar.gz emacs-51cab52b054aaf178743aa7775ae29e934eeba9c.zip | |
Merge from trunk.
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/process.c b/src/process.c index 4151c8aeae6..0040d14a0f6 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -892,7 +892,8 @@ not the name of the pty that Emacs uses to talk with that terminal. */) | |||
| 892 | 892 | ||
| 893 | DEFUN ("set-process-buffer", Fset_process_buffer, Sset_process_buffer, | 893 | DEFUN ("set-process-buffer", Fset_process_buffer, Sset_process_buffer, |
| 894 | 2, 2, 0, | 894 | 2, 2, 0, |
| 895 | doc: /* Set buffer associated with PROCESS to BUFFER (a buffer, or nil). */) | 895 | doc: /* Set buffer associated with PROCESS to BUFFER (a buffer, or nil). |
| 896 | Return BUFFER. */) | ||
| 896 | (register Lisp_Object process, Lisp_Object buffer) | 897 | (register Lisp_Object process, Lisp_Object buffer) |
| 897 | { | 898 | { |
| 898 | struct Lisp_Process *p; | 899 | struct Lisp_Process *p; |