summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>2004-07-31 03:42:27 +0000
committerRichard M. Stallman <rms@gnu.org>2004-07-31 03:42:27 +0000
commit53a7160c9282d9577ec3f6a6168b0b7c824c5e45 (patch)
tree458fb28ca13346deb577f04e6d0ea876037e54a8 /lisp
parent451eaa2138828c165b29f39fe7066dbb04850cb0 (diff)
downloademacs-53a7160c9282d9577ec3f6a6168b0b7c824c5e45.tar.gz
(with-local-quit): Doc fix.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/subr.el5
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d1ec8994edb..05daa1d088b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2004-07-30 Richard M. Stallman <rms@gnu.org>
+
+ * subr.el (with-local-quit): Doc fix.
+
2004-07-30 Luc Teirlinck <teirllm@auburn.edu>
* international/utf-8.el (utf-translate-cjk-mode): Doc fix.
diff --git a/lisp/subr.el b/lisp/subr.el
index 1e30a127f71..8282e3a9316 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1894,7 +1894,10 @@ See also `with-temp-file' and `with-output-to-string'."
(kill-buffer nil)))))
(defmacro with-local-quit (&rest body)
- "Execute BODY with `inhibit-quit' temporarily bound to nil."
+ "Execute BODY, allowing quits to terminate BODY but not escape further.
+When a quit terminates BODY, `with-local-quit' requests another quit when
+it finishes. That quit will be processed in turn, the next time quitting
+is again allowed."
(declare (debug t) (indent 0))
`(condition-case nil
(let ((inhibit-quit nil))