[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 22ebc3a 34/68: ace-window.el (aw--doit): use map with most
From: |
Oleh Krehel |
Subject: |
[elpa] master 22ebc3a 34/68: ace-window.el (aw--doit): use map with most priority |
Date: |
Sat, 21 Mar 2015 19:06:59 +0000 |
branch: master
commit 22ebc3a34f247342b94196c6d0ae5c9bb7fe1bb4
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
ace-window.el (aw--doit): use map with most priority
* ace-window.el (aw--doit): Use `set-transient-map' instead of `(setq
overriding-local-map)`, as it has more priority and `helm' is using
it. This will avoid the current conflict with helm.
Re #15.
---
ace-window.el | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/ace-window.el b/ace-window.el
index 864bb1b..2e6cb57 100644
--- a/ace-window.el
+++ b/ace-window.el
@@ -218,12 +218,14 @@ Set mode line to MODE-LINE during the selection process."
(setq ace-jump-mode mode-line)
(force-mode-line-update)
;; override the local key map
- (setq overriding-local-map
- (let ((map (make-keymap)))
- (dolist (key-code aw-keys)
- (define-key map (make-string 1 key-code) 'aw--callback))
- (define-key map [t] 'ace-jump-done)
- map))
+ (let ((map (make-keymap)))
+ (dolist (key-code aw-keys)
+ (define-key map (make-string 1 key-code) 'aw--callback))
+ (define-key map [t] 'ace-jump-done)
+ (if (fboundp 'set-transient-map)
+ (set-transient-map map)
+ (set-temporary-overlay-map map)))
+
(add-hook 'mouse-leave-buffer-hook 'ace-jump-done)
(add-hook 'kbd-macro-termination-hook 'ace-jump-done))))))
- [elpa] master 5174ca2 25/68: ace-window.el (aw-generic): handle zero-length read-only buffers better, (continued)
- [elpa] master 5174ca2 25/68: ace-window.el (aw-generic): handle zero-length read-only buffers better, Oleh Krehel, 2015/03/21
- [elpa] master 0e821a2 29/68: ace-window.el (aw-offset): use inhibit-field-text-motion t, Oleh Krehel, 2015/03/21
- [elpa] master e0531fd 26/68: ace-window.el: add work-around for autoload, Oleh Krehel, 2015/03/21
- [elpa] master b7b8e72 28/68: ace-window.el (aw-list-visual-area): improve, Oleh Krehel, 2015/03/21
- [elpa] master f7001fb 33/68: ace-window.el (aw-background): new custom, Oleh Krehel, 2015/03/21
- [elpa] master 038a426 31/68: ace-window.el: whitespace, Oleh Krehel, 2015/03/21
- [elpa] master c8d7ae1 21/68: ace-window.el: change version to 0.3.0, Oleh Krehel, 2015/03/21
- [elpa] master 5fb2caf 36/68: ace-window.el: mark two customs as boolean, Oleh Krehel, 2015/03/21
- [elpa] master 3a06c99 35/68: ace-window.el (aw--doit): fix conflict with helm, Oleh Krehel, 2015/03/21
- [elpa] master db5763f 32/68: ace-window.el (aw-swap-window): improve, Oleh Krehel, 2015/03/21
- [elpa] master 22ebc3a 34/68: ace-window.el (aw--doit): use map with most priority,
Oleh Krehel <=
- [elpa] master e03ceb9 30/68: ace-window.el: remove aw-generic macro, Oleh Krehel, 2015/03/21
- [elpa] master 8d40101 39/68: ace-window.el (ace-window-end-hook): add, Oleh Krehel, 2015/03/21
- [elpa] master 752c2cc 37/68: README.md: update, Oleh Krehel, 2015/03/21
- [elpa] master b86d163 40/68: ace-window.el (ace-window-end-once-hook): Add, Oleh Krehel, 2015/03/21
- [elpa] master 6becad8 38/68: ace-window.el: bump version, Oleh Krehel, 2015/03/21
- [elpa] master bb9da9c 44/68: Update `aw--doit' signature, Oleh Krehel, 2015/03/21
- [elpa] master 352c33a 43/68: Finalize transition to `read-char', Oleh Krehel, 2015/03/21
- [elpa] master 32911db 42/68: Start transition to `read-char', Oleh Krehel, 2015/03/21
- [elpa] master 50fafc5 45/68: ace-window.el (aw--doit): don't show anything in echo area, Oleh Krehel, 2015/03/21
- [elpa] master 4291989 41/68: ace-window.el (ace-maximize-window): Add, Oleh Krehel, 2015/03/21