diff options
| author | Glenn Morris | 2019-02-08 09:20:40 -0800 |
|---|---|---|
| committer | Glenn Morris | 2019-02-08 09:20:40 -0800 |
| commit | 0f9940505f87de74c86de17e8a7bf793d9d8dda4 (patch) | |
| tree | 0215c1cc88041710fc32a2d17818e8c66c490ca7 /src | |
| parent | 4f138318d3553162ccc6d0e4554456a65324ec25 (diff) | |
| parent | 0cd7b526a14ead6cbe78df481a2fd975252bb9ac (diff) | |
| download | emacs-0f9940505f87de74c86de17e8a7bf793d9d8dda4.tar.gz emacs-0f9940505f87de74c86de17e8a7bf793d9d8dda4.zip | |
Merge from origin/emacs-26
0cd7b52 (origin/emacs-26) Minor improvements to do strings in callproc.c
b8c7017 Improve documentation of 'date-to-time' and 'parse-time-string'
46095a7 Fix downloading of URLs that end in a slash
3b60a0a * doc/misc/eww.texi (Basics): Fix eww keybindings. (Bug#34291)
8e22025 Fix process-thread docstring
459b669 Fix failures of vc-find-revision with non-ASCII file names
e9ff190 * doc/lispref/tips.texi (Documentation Tips): Fix quotes. (B...
3e49a08 ; * src/coding.h (struct coding_system): Fix a typo in a comm...
b657286 Add documentation for tabulated-list functions in the elisp m...
6e0f67b Fix URL in ucs-normalize.el
ce3ae1f * etc/PROBLEMS: Amend entry for profiler bug #34235 to mentio...
# Conflicts:
# doc/lispref/os.texi
Diffstat (limited to 'src')
| -rw-r--r-- | src/callproc.c | 5 | ||||
| -rw-r--r-- | src/coding.h | 2 | ||||
| -rw-r--r-- | src/process.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/callproc.c b/src/callproc.c index d4558387cfc..a3d09609d7b 100644 --- a/src/callproc.c +++ b/src/callproc.c | |||
| @@ -237,7 +237,7 @@ DESTINATION can also have the form (REAL-BUFFER STDERR-FILE); in that case, | |||
| 237 | t (mix it with ordinary output), or a file name string. | 237 | t (mix it with ordinary output), or a file name string. |
| 238 | 238 | ||
| 239 | Fourth arg DISPLAY non-nil means redisplay buffer as output is inserted. | 239 | Fourth arg DISPLAY non-nil means redisplay buffer as output is inserted. |
| 240 | Remaining arguments are strings passed as command arguments to PROGRAM. | 240 | Remaining arguments ARGS are strings passed as command arguments to PROGRAM. |
| 241 | 241 | ||
| 242 | If executable PROGRAM can't be found as an executable, `call-process' | 242 | If executable PROGRAM can't be found as an executable, `call-process' |
| 243 | signals a Lisp error. `call-process' reports errors in execution of | 243 | signals a Lisp error. `call-process' reports errors in execution of |
| @@ -1033,7 +1033,8 @@ STDERR-FILE may be nil (discard standard error output), | |||
| 1033 | t (mix it with ordinary output), or a file name string. | 1033 | t (mix it with ordinary output), or a file name string. |
| 1034 | 1034 | ||
| 1035 | Sixth arg DISPLAY non-nil means redisplay buffer as output is inserted. | 1035 | Sixth arg DISPLAY non-nil means redisplay buffer as output is inserted. |
| 1036 | Remaining args are passed to PROGRAM at startup as command args. | 1036 | Remaining arguments ARGS are passed to PROGRAM at startup as command-line |
| 1037 | arguments. | ||
| 1037 | 1038 | ||
| 1038 | If BUFFER is 0, `call-process-region' returns immediately with value nil. | 1039 | If BUFFER is 0, `call-process-region' returns immediately with value nil. |
| 1039 | Otherwise it waits for PROGRAM to terminate | 1040 | Otherwise it waits for PROGRAM to terminate |
diff --git a/src/coding.h b/src/coding.h index 337ec46315e..58e12d6176a 100644 --- a/src/coding.h +++ b/src/coding.h | |||
| @@ -450,7 +450,7 @@ struct coding_system | |||
| 450 | 450 | ||
| 451 | unsigned char *safe_charsets; | 451 | unsigned char *safe_charsets; |
| 452 | 452 | ||
| 453 | /* How may heading bytes we can skip for decoding. This is set to | 453 | /* How many heading bytes we can skip for decoding. This is set to |
| 454 | -1 in setup_coding_system, and updated by detect_coding. So, | 454 | -1 in setup_coding_system, and updated by detect_coding. So, |
| 455 | when this is equal to the byte length of the text being | 455 | when this is equal to the byte length of the text being |
| 456 | converted, we can skip the actual conversion process except for | 456 | converted, we can skip the actual conversion process except for |
diff --git a/src/process.c b/src/process.c index 9502ef461e8..802ac026249 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -1360,7 +1360,7 @@ If THREAD is nil, the process is unlocked. */) | |||
| 1360 | 1360 | ||
| 1361 | DEFUN ("process-thread", Fprocess_thread, Sprocess_thread, | 1361 | DEFUN ("process-thread", Fprocess_thread, Sprocess_thread, |
| 1362 | 1, 1, 0, | 1362 | 1, 1, 0, |
| 1363 | doc: /* Ret the locking thread of PROCESS. | 1363 | doc: /* Return the locking thread of PROCESS. |
| 1364 | If PROCESS is unlocked, this function returns nil. */) | 1364 | If PROCESS is unlocked, this function returns nil. */) |
| 1365 | (Lisp_Object process) | 1365 | (Lisp_Object process) |
| 1366 | { | 1366 | { |