[Emacs-diffs] emacs-24 r117190: Fix bug #17615 with C-g during macro definition.

[Eli Zaretskii]

------------------------------------------------------------
revno: 117190
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17615
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Sun 2014-06-01 18:19:14 +0300
message:
  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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/simple.el                 simple.el-20091113204419-o5vbwnq5f7feedwu-403

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-06-01 02:24:23 +0000
+++ b/lisp/ChangeLog    2014-06-01 15:19:14 +0000
@@ -1,3 +1,8 @@
+2014-06-01  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * minibuffer.el (minibuffer-force-complete-and-exit):

=== modified file 'lisp/simple.el'
--- a/lisp/simple.el    2014-05-27 14:59:08 +0000
+++ b/lisp/simple.el    2014-06-01 15:19:14 +0000
@@ -6598,6 +6598,10 @@
     (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)))