From 082c97e81f98661c209d9bb52382d261e249b16e Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 1 Jun 2014 18:19:14 +0300 Subject: [PATCH] Fix bug #17615 with C-g during macro definition. lisp/simple.el (keyboard-quit): Force update of mode lines, to remove the "Def" indicator, if we were defining a macro. --- lisp/ChangeLog | 5 +++++ lisp/simple.el | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 08990e03e7..8e3810f907 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-06-01 Eli Zaretskii + + * 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 * minibuffer.el (minibuffer-force-complete-and-exit): diff --git a/lisp/simple.el b/lisp/simple.el index 7bcd6cf7e7..4cc6e56aef 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -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))) -- 2.20.1