Commit 8889b935 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

* 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
parent bc329caa
2014-05-31 Stefan Monnier <monnier@iro.umontreal.ca>
* 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 <sdl.web@gmail.com> 2014-05-31 Leo Liu <sdl.web@gmail.com>
   
* emacs-lisp/gv.el (window-buffer, window-display-table) * emacs-lisp/gv.el (window-buffer, window-display-table)
......
...@@ -4310,6 +4310,7 @@ lookup sequence then continues." ...@@ -4310,6 +4310,7 @@ lookup sequence then continues."
(lambda () (lambda ()
(with-demoted-errors "set-transient-map PCH: %S" (with-demoted-errors "set-transient-map PCH: %S"
(unless (cond (unless (cond
((null keep-pred) nil)
((not (eq map (cadr overriding-terminal-local-map))) ((not (eq map (cadr overriding-terminal-local-map)))
;; There's presumably some other transient-map in ;; There's presumably some other transient-map in
;; effect. Wait for that one to terminate before we ;; effect. Wait for that one to terminate before we
...@@ -4322,7 +4323,6 @@ lookup sequence then continues." ...@@ -4322,7 +4323,6 @@ lookup sequence then continues."
;; C-u and that 1 exits isearch whereas it doesn't ;; C-u and that 1 exits isearch whereas it doesn't
;; exit C-u. ;; exit C-u.
t) t)
((null keep-pred) nil)
((eq t keep-pred) ((eq t keep-pred)
(eq this-command (eq this-command
(lookup-key map (this-command-keys-vector)))) (lookup-key map (this-command-keys-vector))))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment