From fd8cf7277e7bda0bdcb36b0f8d976a0dbf328372 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 3 Mar 2018 18:04:15 +0100 Subject: [PATCH] Evil: Switch from motion state to normal state --- .emacs.d/lisp/init-emms.el | 2 -- .emacs.d/lisp/init-evil.el | 14 +++++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.emacs.d/lisp/init-emms.el b/.emacs.d/lisp/init-emms.el index db46d2d0..ed0bf226 100644 --- a/.emacs.d/lisp/init-emms.el +++ b/.emacs.d/lisp/init-emms.el @@ -87,7 +87,5 @@ is currently playing." (emms-browser-add-tracks) (emms-browser-add-tracks-and-play))) (define-key emms-browser-mode-map (kbd "") 'ambrevar/emms-browser-add-tracks-and-maybe-play) -(when (fboundp 'evil-define-key) - (evil-define-key '(normal motion) emms-browser-mode-map (kbd "") 'ambrevar/emms-browser-add-tracks-and-maybe-play)) (provide 'init-emms) diff --git a/.emacs.d/lisp/init-evil.el b/.emacs.d/lisp/init-evil.el index 353bcace..08ef261b 100644 --- a/.emacs.d/lisp/init-evil.el +++ b/.emacs.d/lisp/init-evil.el @@ -105,11 +105,11 @@ (with-eval-after-load 'elfeed ;; Custom - (evil-define-key 'motion elfeed-search-mode-map + (evil-define-key 'normal elfeed-search-mode-map (kbd "S-") 'ambrevar/elfeed-visit-maybe-external) - (evil-define-key 'motion elfeed-show-mode-map + (evil-define-key 'normal elfeed-show-mode-map (kbd "S-") 'ambrevar/elfeed-visit-maybe-external) - (evil-define-key 'motion elfeed-show-mode-map + (evil-define-key 'normal elfeed-show-mode-map (kbd "q") 'ambrevar/elfeed-kill-entry)) ;; Custom Helm @@ -142,7 +142,7 @@ (with-eval-after-load 'mu4e (when (require 'evil-mu4e nil t) ;; TODO: evil-mu4e needs a big overhaul, e.g. 'visual commands are not supported. Report upstream. - (evil-define-key 'motion mu4e-headers-mode-map + (evil-define-key 'normal mu4e-headers-mode-map "i" 'mu4e-headers-mark-for-flag "I" 'mu4e-headers-mark-for-unflag ;; "R" 'mu4e-headers-mark-for-refile @@ -152,7 +152,7 @@ "d" 'mu4e-headers-mark-for-trash "D" 'mu4e-headers-mark-for-delete "u" 'mu4e-headers-mark-for-unmark) - (evil-define-key 'motion mu4e-view-mode-map + (evil-define-key 'normal mu4e-view-mode-map (kbd "SPC") 'mu4e-view-scroll-up-or-next (kbd "") 'shr-next-link (kbd "") 'shr-previous-link @@ -206,4 +206,8 @@ (with-eval-after-load 'gnus (require 'init-evil-gnus)) +(with-eval-after-load 'evil-collection-emms + (evil-define-key '(normal motion) emms-browser-mode-map + (kbd "") 'ambrevar/emms-browser-add-tracks-and-maybe-play)) + (provide 'init-evil)