From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 4 Aug 2016 15:39:28 +0000 (+0800)
Subject: Fix Bug#24149
X-Git-Tag: emacs-26.0.90~1803
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=847140163a38af9f429c807f28be023dea9166cf;p=emacs.git

Fix Bug#24149

* lisp/subr.el (set-transient-map): Don't wait if MAP not present in
overriding-terminal-local-map.  (Bug#24149)
---

diff --git a/lisp/subr.el b/lisp/subr.el
index 2c0be204e0a..aa9b7510755 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.