summaryrefslogtreecommitdiff
path: root/doc/lispref/elisp.texi
diff options
context:
space:
mode:
authorTino Calancha <tino.calancha@gmail.com>2016-12-10 23:04:12 +0900
committerTino Calancha <tino.calancha@gmail.com>2016-12-10 23:04:12 +0900
commitae31a7fac5c1cb8d5d3cb3238d15a5e3b791fd69 (patch)
tree2dd1b0284abcc06c0d80500d6d8e86505ec05130 /doc/lispref/elisp.texi
parentafd162d0d782a4889e0c99dc3458a66e36da7cd4 (diff)
parent828b4560cd4a0d8cb9b7a7a3e20ff0c53ba86cfa (diff)
downloademacs-test-concurrency.tar.gz
Merge with remote reptest-concurrency
Diffstat (limited to 'doc/lispref/elisp.texi')
-rw-r--r--doc/lispref/elisp.texi3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index 415dbe66fac..4a53a0cd364 100644
--- a/doc/lispref/elisp.texi
+++ b/doc/lispref/elisp.texi
@@ -349,6 +349,9 @@ Editing Types
* Window Configuration Type:: Recording the way a frame is subdivided.
* Frame Configuration Type:: Recording the status of all frames.
* Process Type:: A subprocess of Emacs running on the underlying OS.
+* Thread Type:: A thread of Emacs Lisp execution.
+* Mutex Type:: An exclusive lock for thread synchronization.
+* Condition Variable Type:: Condition variable for thread synchronization.
* Stream Type:: Receive or send characters.
* Keymap Type:: What function a keystroke invokes.
* Overlay Type:: How an overlay is represented.