bug#24149: 25.1; set-transient-map bug

[Stefan Monnier <monnier@IRO.UMontreal.CA>]

> 1. Enable temp-buffer-browse-mode
> 2. (cl-loop repeat 2 do (with-output-to-temp-buffer "*test*" (princ "ok")))
> 3. Check pre-command-hook
[...]
> Stefan, is the following the right fix?

While the fix is safe, I think it doesn't catch all cases.
A better fix might be something like the untested one below, which makes
sure we only wait when there's still a map of ours.
If it works and looks good to you, please install it.


        Stefan


diff --git a/lisp/subr.el b/lisp/subr.el
index 77bcaa7..4b7cc93 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -4889,7 +4889,8 @@ set-transient-map
             (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.