summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>2004-12-28 12:36:43 +0000
committerRichard M. Stallman <rms@gnu.org>2004-12-28 12:36:43 +0000
commiteab463f6cec1a180334d3223c3981898a2cc9e46 (patch)
treeb01bfd79932523127289a491940f96dda61d1c41
parentf7e282851443c2f46391a347bbe8d5add1f2879f (diff)
downloademacs-eab463f6cec1a180334d3223c3981898a2cc9e46.tar.gz
(Quitting): Clarify value of with-local-quit.
-rw-r--r--lispref/ChangeLog8
-rw-r--r--lispref/commands.texi3
2 files changed, 10 insertions, 1 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 8ebb1b239b9..2ae6b155b80 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,11 @@
+2004-12-28 Richard M. Stallman <rms@gnu.org>
+
+ * commands.texi (Quitting): Clarify value of with-local-quit.
+
+ * elisp.texi (Top): Fix previous change.
+
+ * loading.texi (Loading): Fix previous change.
+
2004-12-27 Richard M. Stallman <rms@gnu.org>
* Makefile.in (MAKEINFO): Specify --force.
diff --git a/lispref/commands.texi b/lispref/commands.texi
index 85e2953f102..fb0eabe272b 100644
--- a/lispref/commands.texi
+++ b/lispref/commands.texi
@@ -2605,7 +2605,8 @@ non-@code{nil}, then @code{quit-flag} has no special effect.
This macro executes @var{forms} in sequence, but allows quitting, at
least locally, within @var{body} even if @code{inhibit-quit} was
non-@code{nil} outside this construct. It returns the value of the
-last form in @var{forms}.
+last form in @var{forms}, unless exited by quitting, in which case
+it returns @code{nil}.
If @code{inhibit-quit} is @code{nil} on entry to @code{with-local-quit},
it only executes the @var{forms}, and setting @code{quit-flag} causes