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.
old-master
Oleh Krehel 11 years ago
parent f7001fb948
commit 22ebc3a34f
  1. 14
      ace-window.el

@ -218,12 +218,14 @@ Set mode line to MODE-LINE during the selection process."
(setq ace-jump-mode mode-line) (setq ace-jump-mode mode-line)
(force-mode-line-update) (force-mode-line-update)
;; override the local key map ;; override the local key map
(setq overriding-local-map (let ((map (make-keymap)))
(let ((map (make-keymap))) (dolist (key-code aw-keys)
(dolist (key-code aw-keys) (define-key map (make-string 1 key-code) 'aw--callback))
(define-key map (make-string 1 key-code) 'aw--callback)) (define-key map [t] 'ace-jump-done)
(define-key map [t] 'ace-jump-done) (if (fboundp 'set-transient-map)
map)) (set-transient-map map)
(set-temporary-overlay-map map)))
(add-hook 'mouse-leave-buffer-hook 'ace-jump-done) (add-hook 'mouse-leave-buffer-hook 'ace-jump-done)
(add-hook 'kbd-macro-termination-hook 'ace-jump-done)))))) (add-hook 'kbd-macro-termination-hook 'ace-jump-done))))))

Loading…
Cancel
Save