From: Peng Li Date: Wed, 23 Sep 2015 13:45:18 +0000 (+0800) Subject: emacs - map escape to keyboard-quit in minibuffer X-Git-Url: http://47.100.26.94:8080/?a=commitdiff_plain;h=d62a6be2ecd4a87350fabd19acb685b359603f22;p=dotfiles.git emacs - map escape to keyboard-quit in minibuffer --- diff --git a/emacs.d/config/init-evil.el b/emacs.d/config/init-evil.el index 63fa63d..5dcdeb6 100644 --- a/emacs.d/config/init-evil.el +++ b/emacs.d/config/init-evil.el @@ -51,8 +51,8 @@ (define-key evil-normal-state-map [escape] 'keyboard-quit) (define-key evil-visual-state-map [escape] 'keyboard-quit) -;(define-key minibuffer-local-map [jscape] 'minibuffer-keyboard-quit) -;(define-key minibuffer-local-ns-map [escape] 'minibuffer-keyboard-quit) +;(define-key minibuffer-local-map [escape] 'keyboard-escape-quit) +;(define-key minibuffer-local-ns-map [escape] 'keyboard-escape-quit) ;(define-key minibuffer-local-completion-map [escape] 'minibuffer-keyboard-quit) ;(define-key minibuffer-local-must-match-map [escape] 'minibuffer-keyboard-quit) ;(define-key minibuffer-local-isearch-map [escape] 'minibuffer-keyboard-quit) diff --git a/emacs.d/config/init-key-binding.el b/emacs.d/config/init-key-binding.el index 76b98bf..cadcf29 100644 --- a/emacs.d/config/init-key-binding.el +++ b/emacs.d/config/init-key-binding.el @@ -84,10 +84,6 @@ - -;(key-chord-define minibuffer-local-map "qq" "\C-g") - - (key-chord-define minibuffer-local-map "jj" 'keyboard-escape-quit) (key-chord-define minibuffer-local-ns-map "jj" 'keyboard-escape-quit) (key-chord-define minibuffer-local-isearch-map "jj" 'keyboard-escape-quit) @@ -98,6 +94,16 @@ (key-chord-define minibuffer-local-filename-must-match-map "jj" 'keyboard-escape-quit) +(define-key minibuffer-local-map [escape] 'keyboard-escape-quit) +(define-key minibuffer-local-ns-map [escape] 'keyboard-escape-quit) +(define-key minibuffer-local-isearch-map [escape] 'keyboard-escape-quit) +(define-key minibuffer-local-completion-map [escape] 'keyboard-escape-quit) +(define-key minibuffer-local-must-match-map [escape] 'keyboard-escape-quit) +(define-key minibuffer-local-must-match-filename-map [escape] 'keyboard-escape-quit) +(define-key minibuffer-local-filename-completion-map [escape] 'keyboard-escape-quit) +(define-key minibuffer-local-filename-must-match-map [escape] 'keyboard-escape-quit) + + (key-chord-mode 1) @@ -211,18 +217,6 @@ ;(global-set-key (kbd "M-g M-w") 'other-window) -;;---------------------------------------------------------------------------- -;; C-o prefix binding for some File/Buffer switching/openning -;; -;;(global-unset-key "\C-o") -;;(global-set-key (kbd "C-o C-o") 'keyboard-quit);; same as C-g to quit -;;; c-o c-o swith to normal mode -;(global-set-key (kbd "C-o C-o") 'evil-normal-state) -;;(global-set-key (kbd "C-o C-o") 'fiplr-find-file) -;(global-set-key (kbd "C-o C-f") 'ido-find-file) -;(global-set-key (kbd "C-o C-n") 'recentf-ido-find-file) -;(global-set-key (kbd "C-o C-j") 'ido-switch-buffer) -;(global-set-key (kbd "C-o C-j") 'ido-find-file) ;(global-set-key (kbd "C-o C-g") 'ggtags-find-file)