summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/simple.el4
2 files changed, 9 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 08990e03e7a..8e3810f907b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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):
diff --git a/lisp/simple.el b/lisp/simple.el
index 7bcd6cf7e71..4cc6e56aef8 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)))