emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] emacs-24 r117182: * lisp/subr.el (set-transient-map): Don'


From: Stefan Monnier
Subject: [Emacs-diffs] emacs-24 r117182: * lisp/subr.el (set-transient-map): Don't wait for some "nested"
Date: Sat, 31 May 2014 20:02:49 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 117182
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17642
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Sat 2014-05-31 16:02:47 -0400
message:
  * lisp/subr.el (set-transient-map): Don't wait for some "nested"
  transient-map to finish if we're only supposed to be active for
  the next command.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/subr.el                   subr.el-20091113204419-o5vbwnq5f7feedwu-151
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-05-31 15:43:43 +0000
+++ b/lisp/ChangeLog    2014-05-31 20:02:47 +0000
@@ -1,3 +1,9 @@
+2014-05-31  Stefan Monnier  <address@hidden>
+
+       * subr.el (set-transient-map): Don't wait for some "nested"
+       transient-map to finish if we're only supposed to be active for
+       the next command (bug#17642).
+
 2014-05-31  Leo Liu  <address@hidden>
 
        * emacs-lisp/gv.el (window-buffer, window-display-table)

=== modified file 'lisp/subr.el'
--- a/lisp/subr.el      2014-05-31 02:13:13 +0000
+++ b/lisp/subr.el      2014-05-31 20:02:47 +0000
@@ -4310,6 +4310,7 @@
           (lambda ()
             (with-demoted-errors "set-transient-map PCH: %S"
               (unless (cond
+                       ((null keep-pred) nil)
                        ((not (eq map (cadr overriding-terminal-local-map)))
                         ;; There's presumably some other transient-map in
                         ;; effect.  Wait for that one to terminate before we
@@ -4322,7 +4323,6 @@
                         ;; C-u and that 1 exits isearch whereas it doesn't
                         ;; exit C-u.
                         t)
-                       ((null keep-pred) nil)
                        ((eq t keep-pred)
                         (eq this-command
                             (lookup-key map (this-command-keys-vector))))


reply via email to

[Prev in Thread] Current Thread [Next in Thread]