summaryrefslogtreecommitdiff
path: root/lisp/subr.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-10-23 02:48:50 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2016-10-23 02:48:50 -0700
commit6df147c61a2f3fbabe6e47349d4e826cc7414ea2 (patch)
tree5164b234cd1018c7997f49f24a95ddcaf5a67dfd /lisp/subr.el
parente892e1158619f546182e990f927abea02cdf5db3 (diff)
parent8ad0d7da0a84750e1884a89a212963f81ae26816 (diff)
downloademacs-6df147c61a2f3fbabe6e47349d4e826cc7414ea2.tar.gz
emacs-6df147c61a2f3fbabe6e47349d4e826cc7414ea2.tar.bz2
emacs-6df147c61a2f3fbabe6e47349d4e826cc7414ea2.zip
Merge from origin/emacs-25
8ad0d7d ; Fix quoting in etc/NEWS 6b9dee1 Change Tramp version to "2.2.13.25.2" 62f2684 * lisp/emacs-lisp/autoload.el (update-directory-autoloads): F... b2f32e4 Don't scan compiled module files for autoloads 9a758b4 Fix Bug#24698 baa8ba4 * lisp/subr.el (start-process): Doc fix. (Bug#24693) e535ca4 Fix display of vc-dir CVS file statuses in subdirectories 12da149 Update URL of MS-Windows optional DLLs 2331056 Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emac... a4285bc * lisp/simple.el (process-menu-mode, list-processes--refresh)... b0c447e * lisp/ibuf-ext.el (ibuffer-do-shell-command-file): Fix non-f... cf3c19b * lisp/ibuffer.el (ibuffer): Improve 'other-window' case. (B... # Conflicts: # doc/misc/trampver.texi # etc/NEWS # lisp/net/tramp-sh.el # lisp/net/trampver.el
Diffstat (limited to 'lisp/subr.el')
-rw-r--r--lisp/subr.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/subr.el b/lisp/subr.el
index 8a1792ad8b7..fba43be9e34 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1999,7 +1999,7 @@ this process is not associated with any buffer.
PROGRAM is the program file name. It is searched for in `exec-path'
\(which see). If nil, just associate a pty with the buffer. Remaining
-arguments are strings to give program as arguments.
+arguments PROGRAM-ARGS are strings to give program as arguments.
If you want to separate standard output from standard error, use
`make-process' or invoke the command through a shell and redirect