[Emacs-diffs] master 8471401: Fix Bug#24149

[Leo Liu]

branch: master
commit 847140163a38af9f429c807f28be023dea9166cf
Author: Stefan Monnier <address@hidden>
Commit: Leo Liu <address@hidden>

    Fix Bug#24149
    
    * lisp/subr.el (set-transient-map): Don't wait if MAP not present in
    overriding-terminal-local-map.  (Bug#24149)
---
 lisp/subr.el |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/subr.el b/lisp/subr.el
index 2c0be20..aa9b751 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -4542,7 +4542,8 @@ to deactivate this transient map, regardless of 
KEEP-PRED."
             (with-demoted-errors "set-transient-map PCH: %S"
               (unless (cond
                        ((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
                         ;; effect.  Wait for that one to terminate before we
                         ;; remove ourselves.