aboutsummaryrefslogtreecommitdiffstats
path: root/src/process.c
diff options
context:
space:
mode:
authorAnders Lindgren2015-10-28 12:09:51 +0100
committerAnders Lindgren2015-10-28 12:09:51 +0100
commitcc587a3539612d250d222363b18d15258e33f82a (patch)
tree00c74927ef3da99c7226cbaf586d439e0236b85c /src/process.c
parent590449f3d87f8f43eb0a852233e8945ecbe1c6aa (diff)
parent64c2bfbc4f5daba2ee55acb58a2929070a846b6e (diff)
downloademacs-cc587a3539612d250d222363b18d15258e33f82a.tar.gz
emacs-cc587a3539612d250d222363b18d15258e33f82a.zip
Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/emacs
Diffstat (limited to 'src/process.c')
-rw-r--r--src/process.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/process.c b/src/process.c
index dc93b86cee2..ed1d59d01b0 100644
--- a/src/process.c
+++ b/src/process.c
@@ -7176,8 +7176,10 @@ setup_process_coding_systems (Lisp_Object process)
7176} 7176}
7177 7177
7178DEFUN ("get-buffer-process", Fget_buffer_process, Sget_buffer_process, 1, 1, 0, 7178DEFUN ("get-buffer-process", Fget_buffer_process, Sget_buffer_process, 1, 1, 0,
7179 doc: /* Return the (or a) process associated with BUFFER. 7179 doc: /* Return the (or a) live process associated with BUFFER.
7180BUFFER may be a buffer or the name of one. */) 7180BUFFER may be a buffer or the name of one.
7181Return nil if all processes associated with BUFFER have been
7182deleted or killed. */)
7181 (register Lisp_Object buffer) 7183 (register Lisp_Object buffer)
7182{ 7184{
7183#ifdef subprocesses 7185#ifdef subprocesses