From 8889b935d16baa59a76417d465f54501e8246b1a Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sat, 31 May 2014 16:02:47 -0400 Subject: [PATCH] * 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. Fixes: debbugs:17642 --- lisp/ChangeLog | 6 ++++++ lisp/subr.el | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3d09caba9a7..20257f089d9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2014-05-31 Stefan Monnier + + * 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 * emacs-lisp/gv.el (window-buffer, window-display-table) diff --git a/lisp/subr.el b/lisp/subr.el index 4fba469868f..c8dcfc8df97 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -4310,6 +4310,7 @@ lookup sequence then continues." (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 @@ lookup sequence then continues." ;; 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)))) -- 2.39.5