aboutsummaryrefslogtreecommitdiffstats
path: root/src/process.c
diff options
context:
space:
mode:
authorGlenn Morris2019-02-08 09:20:40 -0800
committerGlenn Morris2019-02-08 09:20:40 -0800
commit0f9940505f87de74c86de17e8a7bf793d9d8dda4 (patch)
tree0215c1cc88041710fc32a2d17818e8c66c490ca7 /src/process.c
parent4f138318d3553162ccc6d0e4554456a65324ec25 (diff)
parent0cd7b526a14ead6cbe78df481a2fd975252bb9ac (diff)
downloademacs-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/process.c')
-rw-r--r--src/process.c2
1 files changed, 1 insertions, 1 deletions
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
1361DEFUN ("process-thread", Fprocess_thread, Sprocess_thread, 1361DEFUN ("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.
1364If PROCESS is unlocked, this function returns nil. */) 1364If PROCESS is unlocked, this function returns nil. */)
1365 (Lisp_Object process) 1365 (Lisp_Object process)
1366{ 1366{