diff options
| author | Phillip Lord | 2016-06-06 09:35:17 +0100 |
|---|---|---|
| committer | Phillip Lord | 2016-06-08 22:45:00 +0100 |
| commit | a813487f1adf4cf59d7a471d62d22f706f9eab1d (patch) | |
| tree | 873e54935a7e221778155e2abe2e8e2097b2d01b /src | |
| parent | 1f85b7ca034ee4f96d796d95ec86bc4fa0ba8aa3 (diff) | |
| download | emacs-a813487f1adf4cf59d7a471d62d22f706f9eab1d.tar.gz emacs-a813487f1adf4cf59d7a471d62d22f706f9eab1d.zip | |
Fix undo boundary in recursive edit (Bug#23632)
* src/keyboard.c (recursive_edit_1): specbind
undo-auto--undoably-changed-buffers.
* lisp/simple.el (undo-auto--undoably-changed-buffers):
fix docstring.
Diffstat (limited to 'src')
| -rw-r--r-- | src/keyboard.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index e3858a5d8dc..2db9aaf0297 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -681,6 +681,14 @@ recursive_edit_1 (void) | |||
| 681 | specbind (Qinhibit_redisplay, Qnil); | 681 | specbind (Qinhibit_redisplay, Qnil); |
| 682 | redisplaying_p = 0; | 682 | redisplaying_p = 0; |
| 683 | 683 | ||
| 684 | /* This variable stores buffers that have changed so that an undo | ||
| 685 | boundary can be added. specbind this so that changes in the | ||
| 686 | recursive edit will not result in undo boundaries in buffers | ||
| 687 | changed before we entered there recursive edit. | ||
| 688 | See Bug #23632. | ||
| 689 | */ | ||
| 690 | specbind (Qundo_auto__undoably_changed_buffers, Qnil); | ||
| 691 | |||
| 684 | val = command_loop (); | 692 | val = command_loop (); |
| 685 | if (EQ (val, Qt)) | 693 | if (EQ (val, Qt)) |
| 686 | Fsignal (Qquit, Qnil); | 694 | Fsignal (Qquit, Qnil); |
| @@ -10956,6 +10964,8 @@ syms_of_keyboard (void) | |||
| 10956 | DEFSYM (Qpost_command_hook, "post-command-hook"); | 10964 | DEFSYM (Qpost_command_hook, "post-command-hook"); |
| 10957 | 10965 | ||
| 10958 | DEFSYM (Qundo_auto__add_boundary, "undo-auto--add-boundary"); | 10966 | DEFSYM (Qundo_auto__add_boundary, "undo-auto--add-boundary"); |
| 10967 | DEFSYM (Qundo_auto__undoably_changed_buffers, | ||
| 10968 | "undo-auto--undoably-changed-buffers"); | ||
| 10959 | 10969 | ||
| 10960 | DEFSYM (Qdeferred_action_function, "deferred-action-function"); | 10970 | DEFSYM (Qdeferred_action_function, "deferred-action-function"); |
| 10961 | DEFSYM (Qdelayed_warnings_hook, "delayed-warnings-hook"); | 10971 | DEFSYM (Qdelayed_warnings_hook, "delayed-warnings-hook"); |