procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug #17615 with C-g during macro definition.

Browse source 
lisp/simple.el (keyboard-quit): Force update of mode lines, to remove
 the "Def" indicator, if we were defining a macro.
This commit is contained in:
Eli Zaretskii 2014-06-01 18:19:14 +03:00
parent bcbee9833a
commit 082c97e81f
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2014-06-01 Eli Zaretskii <eliz@gnu.org>
* simple.el (keyboard-quit): Force update of mode lines, to remove
the "Def" indicator, if we were defining a macro. (Bug#17615)
2014-06-01 Stefan Monnier <monnier@iro.umontreal.ca>
* minibuffer.el (minibuffer-force-complete-and-exit):

4
lisp/simple.el
View file

@ -6598,6 +6598,10 @@ At top-level, as an editor command, this simply beeps."
(deactivate-mark))
(if (fboundp 'kmacro-keyboard-quit)
(kmacro-keyboard-quit))
;; Force the next redisplay cycle to remove the "Def" indicator from
;; all the mode lines.
(if defining-kbd-macro
(force-mode-line-update t))
(setq defining-kbd-macro nil)
(let ((debug-on-quit nil))
(signal 'quit nil)))