diff options
| author | Stefan Monnier | 2016-08-04 23:39:28 +0800 |
|---|---|---|
| committer | Leo Liu | 2016-08-04 23:42:07 +0800 |
| commit | 847140163a38af9f429c807f28be023dea9166cf (patch) | |
| tree | 02bd32c7c946a993864e63d7ada54d5ab95063c5 | |
| parent | 7f9721d3990155bae83e4e4840f0ff4913868d50 (diff) | |
| download | emacs-847140163a38af9f429c807f28be023dea9166cf.tar.gz emacs-847140163a38af9f429c807f28be023dea9166cf.zip | |
Fix Bug#24149
* lisp/subr.el (set-transient-map): Don't wait if MAP not present in
overriding-terminal-local-map. (Bug#24149)
| -rw-r--r-- | lisp/subr.el | 3 |
1 files changed, 2 insertions, 1 deletions
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." | |||
| 4542 | (with-demoted-errors "set-transient-map PCH: %S" | 4542 | (with-demoted-errors "set-transient-map PCH: %S" |
| 4543 | (unless (cond | 4543 | (unless (cond |
| 4544 | ((null keep-pred) nil) | 4544 | ((null keep-pred) nil) |
| 4545 | ((not (eq map (cadr overriding-terminal-local-map))) | 4545 | ((and (not (eq map (cadr overriding-terminal-local-map))) |
| 4546 | (memq map (cddr overriding-terminal-local-map))) | ||
| 4546 | ;; There's presumably some other transient-map in | 4547 | ;; There's presumably some other transient-map in |
| 4547 | ;; effect. Wait for that one to terminate before we | 4548 | ;; effect. Wait for that one to terminate before we |
| 4548 | ;; remove ourselves. | 4549 | ;; remove ourselves. |