Commit 84714016 authored by Stefan Monnier's avatar Stefan Monnier Committed by Leo Liu
Browse files

Fix Bug#24149

* lisp/subr.el (set-transient-map): Don't wait if MAP not present in
overriding-terminal-local-map.  (Bug#24149)
parent 7f9721d3
...@@ -4542,7 +4542,8 @@ to deactivate this transient map, regardless of KEEP-PRED." ...@@ -4542,7 +4542,8 @@ to deactivate this transient map, regardless of KEEP-PRED."
(with-demoted-errors "set-transient-map PCH: %S" (with-demoted-errors "set-transient-map PCH: %S"
(unless (cond (unless (cond
((null keep-pred) nil) ((null keep-pred) nil)
((not (eq map (cadr overriding-terminal-local-map))) ((and (not (eq map (cadr overriding-terminal-local-map)))
(memq map (cddr 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
;; remove ourselves. ;; remove ourselves.
......
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