diff options
| author | Lars Ingebrigtsen | 2014-02-07 19:29:47 -0800 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2014-02-07 19:29:47 -0800 |
| commit | bb01d7bbc7d8cd7fc8028f33f1cc77becb1d0104 (patch) | |
| tree | c8cc434436cfa8ac738aa3b23a083cae8ac8f65e /src | |
| parent | 518f26c27ba8bf59a642ec0dd3c21e8915e10eef (diff) | |
| download | emacs-bb01d7bbc7d8cd7fc8028f33f1cc77becb1d0104.tar.gz emacs-bb01d7bbc7d8cd7fc8028f33f1cc77becb1d0104.zip | |
* keyboard.c (Frecursive_edit): Say more precicely how throwing `exit' works.
Fixes: debbugs:15865
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/keyboard.c | 10 |
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 @@ | |||
| 1 | 2014-02-08 Lars Ingebrigtsen <larsi@gnus.org> | ||
| 2 | |||
| 3 | * keyboard.c (Frecursive_edit): Say more precicely how throwing | ||
| 4 | `exit' works (bug#15865). | ||
| 5 | |||
| 1 | 2014-02-07 Martin Rudalics <rudalics@gmx.at> | 6 | 2014-02-07 Martin Rudalics <rudalics@gmx.at> |
| 2 | 7 | ||
| 3 | Constrain window box/body sizes and margin widths (Bug#16649). | 8 | 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) | |||
| 807 | 807 | ||
| 808 | DEFUN ("recursive-edit", Frecursive_edit, Srecursive_edit, 0, 0, "", | 808 | DEFUN ("recursive-edit", Frecursive_edit, Srecursive_edit, 0, 0, "", |
| 809 | doc: /* Invoke the editor command loop recursively. | 809 | doc: /* Invoke the editor command loop recursively. |
| 810 | To get out of the recursive edit, a command can do `(throw 'exit nil)'; | 810 | To get out of the recursive edit, a command can throw to `exit' -- for |
| 811 | that tells this function to return. | 811 | instance `(throw 'exit nil)'. |
| 812 | Alternatively, `(throw 'exit t)' makes this function signal an error. | 812 | If you throw a value other than t, `recursive-edit' returns normally |
| 813 | to the function that called it. Throwing a t value causes | ||
| 814 | `recursive-edit' to quit, so that control returns to the command loop | ||
| 815 | one level up | ||
| 816 | |||
| 813 | This function is called by the editor initialization to begin editing. */) | 817 | This function is called by the editor initialization to begin editing. */) |
| 814 | (void) | 818 | (void) |
| 815 | { | 819 | { |