diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/simple.el | 7 | ||||
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/process.c | 2 |
4 files changed, 12 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9aecbd0f280..65bbc8a305b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -3,6 +3,10 @@ * emacs-lisp/nadvice.el (advice--called-interactively-skip): Use the new `base' arg of backtrace-frame. +2013-07-26 Eli Zaretskii <eliz@gnu.org> + + * simple.el (list-processes): Doc fix. + 2013-07-26 Juanma Barranquero <lekktu@gmail.com> * desktop.el (desktop--select-frame): diff --git a/lisp/simple.el b/lisp/simple.el index 6f5cac2d011..1fb2fa6014c 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -3141,14 +3141,17 @@ Also, delete any process that is exited or signaled." (display-buffer (button-get button 'process-buffer))) (defun list-processes (&optional query-only buffer) - "Display a list of all processes. + "Display a list of all processes that are Emacs sub-processes. If optional argument QUERY-ONLY is non-nil, only processes with the query-on-exit flag set are listed. Any process listed as exited or signaled is actually eliminated after the listing is made. Optional argument BUFFER specifies a buffer to use, instead of \"*Process List*\". -The return value is always nil." +The return value is always nil. + +This function lists only processes that were launched by Emacs. To +see other processes running on the system, use `list-system-processes'." (interactive) (or (fboundp 'process-list) (error "Asynchronous subprocesses are not supported on this system")) diff --git a/src/ChangeLog b/src/ChangeLog index 59eb16a81e9..38fa72b0506 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2013-07-26 Eli Zaretskii <eliz@gnu.org> + * process.c (Fprocess_list): Doc fix. + * w32term.c (w32_read_socket) <WM_EMACS_PAINT>: Warn about frame being re-exposed only if it didn't ask to become visible. <WM_SIZE>: Under SIZE_RESTORED, only set the frame visible if it diff --git a/src/process.c b/src/process.c index 34783fae5fd..d87a1803fe2 100644 --- a/src/process.c +++ b/src/process.c @@ -1330,7 +1330,7 @@ Returns nil if format of ADDRESS is invalid. */) } DEFUN ("process-list", Fprocess_list, Sprocess_list, 0, 0, 0, - doc: /* Return a list of all processes. */) + doc: /* Return a list of all processes that are Emacs sub-processes. */) (void) { return Fmapcar (Qcdr, Vprocess_alist); |