diff options
| author | Glenn Morris <rgm@gnu.org> | 2019-08-20 09:01:55 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2019-08-20 09:01:55 -0700 |
| commit | 8f68449c9476956425881bf1534fa727d5247448 (patch) | |
| tree | 6647f6d286b2efdfab829f0a6715164743594084 /src/callproc.c | |
| parent | 65dc07f563f229faadaa44312776941abbf6e1b6 (diff) | |
| parent | 0b810ebc9fe65e447e37832db40ccf634e5548d9 (diff) | |
| download | emacs-8f68449c9476956425881bf1534fa727d5247448.tar.gz | |
Merge from origin/emacs-26
0b810eb Fix a typo in char-width-table
3f00db7 Minor update in admin/notes/unicode
bcd0115 Fix lisp indent infloop on unfinished strings (Bug#37045)
5f992d1 Improve commentary in composite.el
3a04be2 ; Improve commentary in xdisp.c
15de1d1 Fix markup in dired-x.texi
bda7fc7 ; Fix typo in a doc string of speedbar.el
6f57ef9 * src/callproc.c (Fcall_process): Doc fix.
# Conflicts:
# doc/misc/dired-x.texi
# lisp/international/characters.el
# src/callproc.c
Diffstat (limited to 'src/callproc.c')
| -rw-r--r-- | src/callproc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/callproc.c b/src/callproc.c index 3c77238cfb6..b296bdb088b 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -220,7 +220,7 @@ DEFUN ("call-process", Fcall_process, Scall_process, 1, MANY, 0, doc: /* Call PROGRAM synchronously in separate process. The remaining arguments are optional. -The program's input comes from file INFILE (nil means `/dev/null'). +The program's input comes from file INFILE (nil means `null-device'). If you want to make the input come from an Emacs buffer, use `call-process-region' instead. |