summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2014-02-07 19:29:47 -0800
committerLars Ingebrigtsen <larsi@gnus.org>2014-02-07 19:29:47 -0800
commitbb01d7bbc7d8cd7fc8028f33f1cc77becb1d0104 (patch)
treec8cc434436cfa8ac738aa3b23a083cae8ac8f65e
parent518f26c27ba8bf59a642ec0dd3c21e8915e10eef (diff)
* keyboard.c (Frecursive_edit): Say more precicely how throwing `exit' works.
Fixes: debbugs:15865
-rw-r--r--src/ChangeLog5
-rw-r--r--src/keyboard.c10
2 files changed, 12 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index a056eead1f6..d5554989190 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-08 Lars Ingebrigtsen <larsi@gnus.org>
+
+ * keyboard.c (Frecursive_edit): Say more precicely how throwing
+ `exit' works (bug#15865).
+
2014-02-07 Martin Rudalics <rudalics@gmx.at>
Constrain window box/body sizes and margin widths (Bug#16649).
diff --git a/src/keyboard.c b/src/keyboard.c
index 1914dca0ba5..52bb50800df 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -807,9 +807,13 @@ force_auto_save_soon (void)
DEFUN ("recursive-edit", Frecursive_edit, Srecursive_edit, 0, 0, "",
doc: /* Invoke the editor command loop recursively.
-To get out of the recursive edit, a command can do `(throw 'exit nil)';
-that tells this function to return.
-Alternatively, `(throw 'exit t)' makes this function signal an error.
+To get out of the recursive edit, a command can throw to `exit' -- for
+instance `(throw 'exit nil)'.
+If you throw a value other than t, `recursive-edit' returns normally
+to the function that called it. Throwing a t value causes
+`recursive-edit' to quit, so that control returns to the command loop
+one level up
+
This function is called by the editor initialization to begin editing. */)
(void)
{