emacs/evil-collection
1
0
Fork 0
mirror of https://github.com/jojojames/evil-collection.git synced 2024-06-29 07:50:50 +02:00
Code Issues Releases Wiki Activity

Simplify evil-collection-mu4e.el

Browse Source
This commit is contained in:
Justin Burkett 2018-07-10 21:44:38 -04:00 committed by Pierre Neidhardt
parent 9436d96d00
commit d099105753
1 changed files with 131 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

254
evil-collection-mu4e.el
View File

@ -95,135 +95,140 @@
;; TODO: Inhibit insert-state functions as per Evil Collection. ;; TODO: Inhibit insert-state functions as per Evil Collection.
(defvar evil-collection-mu4e-mode-map-bindings (defvar evil-collection-mu4e-mode-map-bindings
`((mu4e-main-mode-map "J" mu4e~headers-jump-to-maildir) `((mu4e-main-mode-map
(mu4e-main-mode-map "j" next-line) "J" mu4e~headers-jump-to-maildir
(mu4e-main-mode-map "k" previous-line) "j" next-line
(mu4e-main-mode-map "u" mu4e-update-mail-and-index) "k" previous-line
(mu4e-main-mode-map "gr" revert-buffer) "u" mu4e-update-mail-and-index
(mu4e-main-mode-map "b" mu4e-headers-search-bookmark) "gr" revert-buffer
(mu4e-main-mode-map "B" mu4e-headers-search-bookmark-edit) "b" mu4e-headers-search-bookmark
(mu4e-main-mode-map "N" mu4e-news) "B" mu4e-headers-search-bookmark-edit
(mu4e-main-mode-map ";" mu4e-context-switch) "N" mu4e-news
(mu4e-main-mode-map "H" mu4e-display-manual) ";" mu4e-context-switch
(mu4e-main-mode-map "C" mu4e-compose-new) "H" mu4e-display-manual
(mu4e-main-mode-map "cc" mu4e-compose-new) "C" mu4e-compose-new
(mu4e-main-mode-map "x" mu4e-kill-update-mail) "cc" mu4e-compose-new
(mu4e-main-mode-map "A" mu4e-about) "x" mu4e-kill-update-mail
(mu4e-main-mode-map "f" smtpmail-send-queued-mail) "A" mu4e-about
(mu4e-main-mode-map "m" mu4e~main-toggle-mail-sending-mode) "f" smtpmail-send-queued-mail
(mu4e-main-mode-map "s" mu4e-headers-search) "m" mu4e~main-toggle-mail-sending-mode
(mu4e-main-mode-map "q" mu4e-quit) "s" mu4e-headers-search
"q" mu4e-quit)
(mu4e-headers-mode-map "q" mu4e~headers-quit-buffer) (mu4e-headers-mode-map
(mu4e-headers-mode-map "J" mu4e~headers-jump-to-maildir) "q" mu4e~headers-quit-buffer
(mu4e-headers-mode-map "C" mu4e-compose-new) "J" mu4e~headers-jump-to-maildir
(mu4e-headers-mode-map "E" mu4e-compose-edit) "C" mu4e-compose-new
(mu4e-headers-mode-map "F" mu4e-compose-forward) "E" mu4e-compose-edit
(mu4e-headers-mode-map "R" mu4e-compose-reply) "F" mu4e-compose-forward
(mu4e-headers-mode-map "cc" mu4e-compose-new) "R" mu4e-compose-reply
(mu4e-headers-mode-map "ce" mu4e-compose-edit) "cc" mu4e-compose-new
(mu4e-headers-mode-map "cf" mu4e-compose-forward) "ce" mu4e-compose-edit
(mu4e-headers-mode-map "cr" mu4e-compose-reply) "cf" mu4e-compose-forward
(mu4e-headers-mode-map "o" mu4e-headers-change-sorting) "cr" mu4e-compose-reply
(mu4e-headers-mode-map "j" mu4e-headers-next) "o" mu4e-headers-change-sorting
(mu4e-headers-mode-map "k" mu4e-headers-prev) "j" mu4e-headers-next
(mu4e-headers-mode-map "gr" mu4e-headers-rerun-search) "k" mu4e-headers-prev
(mu4e-headers-mode-map "b" mu4e-headers-search-bookmark) "gr" mu4e-headers-rerun-search
(mu4e-headers-mode-map "B" mu4e-headers-search-bookmark-edit) "b" mu4e-headers-search-bookmark
(mu4e-headers-mode-map ";" mu4e-context-switch) "B" mu4e-headers-search-bookmark-edit
(mu4e-headers-mode-map ,(kbd "RET") mu4e-headers-view-message) ";" mu4e-context-switch
(mu4e-headers-mode-map "/" mu4e-headers-search-narrow) ,(kbd "RET") mu4e-headers-view-message
(mu4e-headers-mode-map "s" mu4e-headers-search) "/" mu4e-headers-search-narrow
(mu4e-headers-mode-map "S" mu4e-headers-search-edit) "s" mu4e-headers-search
(mu4e-headers-mode-map "x" mu4e-mark-execute-all) "S" mu4e-headers-search-edit
(mu4e-headers-mode-map "a" mu4e-headers-action) "x" mu4e-mark-execute-all
(mu4e-headers-mode-map "*" mu4e-headers-mark-for-something) ; TODO: Don't override evil-seach-word-forward? "a" mu4e-headers-action
(mu4e-headers-mode-map "&" mu4e-headers-mark-custom) "*" mu4e-headers-mark-for-something ; TODO: Don't override evil-seach-word-forward?
(mu4e-headers-mode-map "A" mu4e-headers-mark-for-action) "&" mu4e-headers-mark-custom
(mu4e-headers-mode-map "m" mu4e-headers-mark-for-move) "A" mu4e-headers-mark-for-action
(mu4e-headers-mode-map "r" mu4e-headers-mark-for-refile) "m" mu4e-headers-mark-for-move
(mu4e-headers-mode-map "D" mu4e-headers-mark-for-delete) "r" mu4e-headers-mark-for-refile
(mu4e-headers-mode-map "d" mu4e-headers-mark-for-trash) "D" mu4e-headers-mark-for-delete
(mu4e-headers-mode-map "=" mu4e-headers-mark-for-untrash) "d" mu4e-headers-mark-for-trash
(mu4e-headers-mode-map "u" mu4e-headers-mark-for-unmark) "=" mu4e-headers-mark-for-untrash
(mu4e-headers-mode-map "U" mu4e-mark-unmark-all) "u" mu4e-headers-mark-for-unmark
(mu4e-headers-mode-map "?" mu4e-headers-mark-for-unread) "U" mu4e-mark-unmark-all
(mu4e-headers-mode-map "!" mu4e-headers-mark-for-read) "?" mu4e-headers-mark-for-unread
(mu4e-headers-mode-map "%" mu4e-headers-mark-pattern) "!" mu4e-headers-mark-for-read
(mu4e-headers-mode-map "+" mu4e-headers-mark-for-flag) "%" mu4e-headers-mark-pattern
(mu4e-headers-mode-map "-" mu4e-headers-mark-for-unflag) "+" mu4e-headers-mark-for-flag
(mu4e-headers-mode-map "[" mu4e-headers-prev-unread) "-" mu4e-headers-mark-for-unflag
(mu4e-headers-mode-map "]" mu4e-headers-next-unread) "[" mu4e-headers-prev-unread
(mu4e-headers-mode-map "gk" mu4e-headers-prev-unread) "]" mu4e-headers-next-unread
(mu4e-headers-mode-map "gj" mu4e-headers-next-unread) "gk" mu4e-headers-prev-unread
(mu4e-headers-mode-map "\C-j" mu4e-headers-next) "gj" mu4e-headers-next-unread
(mu4e-headers-mode-map "\C-k" mu4e-headers-prev) "\C-j" mu4e-headers-next
(mu4e-headers-mode-map "zr" mu4e-headers-toggle-include-related) "\C-k" mu4e-headers-prev
(mu4e-headers-mode-map "zt" mu4e-headers-toggle-threading) "zr" mu4e-headers-toggle-include-related
(mu4e-headers-mode-map "zd" mu4e-headers-toggle-skip-duplicates) "zt" mu4e-headers-toggle-threading
(mu4e-headers-mode-map "gl" mu4e-show-log) "zd" mu4e-headers-toggle-skip-duplicates
(mu4e-headers-mode-map "gv" mu4e-select-other-view) "gl" mu4e-show-log
(mu4e-headers-mode-map "T" (lambda () "gv" mu4e-select-other-view
"T" (lambda ()
(interactive) (interactive)
(mu4e-headers-mark-thread nil '(read)))) (mu4e-headers-mark-thread nil '(read))))
;; (,evil-collection-mu4e-state mu4e-compose-mode-map "gg" mu4e-compose-goto-top) ; TODO: Make this work. ;; (,evil-collection-mu4e-state mu4e-compose-mode-map "gg" mu4e-compose-goto-top) ; TODO: Make this work.
(mu4e-view-mode-map ,(kbd "SPC") mu4e-view-scroll-up-or-next) (mu4e-view-mode-map
(mu4e-view-mode-map ,(kbd "<tab>") shr-next-link) " " mu4e-view-scroll-up-or-next
(mu4e-view-mode-map ,(kbd "<backtab>") shr-previous-link) [tab] shr-next-link
(mu4e-view-mode-map "q" mu4e~view-quit-buffer) [backtab] shr-previous-link
(mu4e-view-mode-map "gx" mu4e-view-go-to-url) "q" mu4e~view-quit-buffer
(mu4e-view-mode-map "gX" mu4e-view-fetch-url) "gx" mu4e-view-go-to-url
(mu4e-view-mode-map "C" mu4e-compose-new) "gX" mu4e-view-fetch-url
(mu4e-view-mode-map "H" mu4e-view-toggle-html) "C" mu4e-compose-new
;te mu4e-view-mode-map "E" mu4e-compose-edit) "H" mu4e-view-toggle-html
;te mu4e-view-mode-map "F" mu4e-compose-forward) ;; "E" mu4e-compose-edit
(mu4e-view-mode-map "R" mu4e-compose-reply) ;; "F" mu4e-compose-forward
(mu4e-view-mode-map "cc" mu4e-compose-new) "R" mu4e-compose-reply
(mu4e-view-mode-map "ce" mu4e-compose-edit) "cc" mu4e-compose-new
(mu4e-view-mode-map "cf" mu4e-compose-forward) "ce" mu4e-compose-edit
(mu4e-view-mode-map "cr" mu4e-compose-reply) "cf" mu4e-compose-forward
(mu4e-view-mode-map "p" mu4e-view-save-attachment) "cr" mu4e-compose-reply
(mu4e-view-mode-map "P" mu4e-view-save-attachment-multi) ; Since mu4e 1.0, -multi is same as normal. "p" mu4e-view-save-attachment
(mu4e-view-mode-map "O" mu4e-headers-change-sorting) "P" mu4e-view-save-attachment-multi ; Since mu4e 1.0, -multi is same as normal.
(mu4e-view-mode-map "o" mu4e-view-open-attachment) "O" mu4e-headers-change-sorting
(mu4e-view-mode-map "A" mu4e-view-attachment-action) "o" mu4e-view-open-attachment
(mu4e-view-mode-map "a" mu4e-view-action) "A" mu4e-view-attachment-action
(mu4e-view-mode-map "J" mu4e~headers-jump-to-maildir) "a" mu4e-view-action
(mu4e-view-mode-map "[" mu4e-view-headers-prev-unread) "J" mu4e~headers-jump-to-maildir
(mu4e-view-mode-map "]" mu4e-view-headers-next-unread) "[" mu4e-view-headers-prev-unread
(mu4e-view-mode-map "gk" mu4e-view-headers-prev-unread) "]" mu4e-view-headers-next-unread
(mu4e-view-mode-map "gj" mu4e-view-headers-next-unread) "gk" mu4e-view-headers-prev-unread
(mu4e-view-mode-map "\C-j" mu4e-view-headers-next) "gj" mu4e-view-headers-next-unread
(mu4e-view-mode-map "\C-k" mu4e-view-headers-prev) "\C-j" mu4e-view-headers-next
(mu4e-view-mode-map "x" mu4e-view-marked-execute) "\C-k" mu4e-view-headers-prev
(mu4e-view-mode-map "&" mu4e-view-mark-custom) "x" mu4e-view-marked-execute
(mu4e-view-mode-map "*" mu4e-view-mark-for-something) ; TODO: Don't override "*". "&" mu4e-view-mark-custom
(mu4e-view-mode-map "m" mu4e-view-mark-for-move) "*" mu4e-view-mark-for-something ; TODO: Don't override "*".
(mu4e-view-mode-map "r" mu4e-view-mark-for-refile) "m" mu4e-view-mark-for-move
(mu4e-view-mode-map "D" mu4e-view-mark-for-delete) "r" mu4e-view-mark-for-refile
(mu4e-view-mode-map "d" mu4e-view-mark-for-trash) "D" mu4e-view-mark-for-delete
(mu4e-view-mode-map "=" mu4e-view-mark-for-untrash) "d" mu4e-view-mark-for-trash
(mu4e-view-mode-map "u" mu4e-view-unmark) "=" mu4e-view-mark-for-untrash
(mu4e-view-mode-map "U" mu4e-view-unmark-all) "u" mu4e-view-unmark
(mu4e-view-mode-map "?" mu4e-view-mark-for-unread) "U" mu4e-view-unmark-all
(mu4e-view-mode-map "!" mu4e-view-mark-for-read) "?" mu4e-view-mark-for-unread
(mu4e-view-mode-map "%" mu4e-view-mark-pattern) "!" mu4e-view-mark-for-read
(mu4e-view-mode-map "+" mu4e-view-mark-for-flag) "%" mu4e-view-mark-pattern
(mu4e-view-mode-map "-" mu4e-view-mark-for-unflag) "+" mu4e-view-mark-for-flag
(mu4e-view-mode-map "zr" mu4e-headers-toggle-include-related) "-" mu4e-view-mark-for-unflag
(mu4e-view-mode-map "zt" mu4e-headers-toggle-threading) "zr" mu4e-headers-toggle-include-related
(mu4e-view-mode-map "za" mu4e-view-toggle-hide-cited) "zt" mu4e-headers-toggle-threading
(mu4e-view-mode-map "gl" mu4e-show-log) "za" mu4e-view-toggle-hide-cited
(mu4e-view-mode-map "s" mu4e-view-search-edit) "gl" mu4e-show-log
(mu4e-view-mode-map "|" mu4e-view-pipe) "s" mu4e-view-search-edit
(mu4e-view-mode-map "." mu4e-view-raw-message) "|" mu4e-view-pipe
(mu4e-view-mode-map ,(kbd "C--") mu4e-headers-split-view-shrink) "." mu4e-view-raw-message
(mu4e-view-mode-map ,(kbd "C-+") mu4e-headers-split-view-grow) ,(kbd "C--") mu4e-headers-split-view-shrink
(mu4e-view-mode-map "T" (lambda () ,(kbd "C-+") mu4e-headers-split-view-grow
"T" (lambda ()
(interactive) (interactive)
(mu4e-headers-mark-thread nil '(read))))) (mu4e-headers-mark-thread nil '(read)))
,@(when evil-want-C-u-scroll
'("\C-u" evil-scroll-up))))
;; TODO: Add mu4e-headers-search-bookmark? ;; TODO: Add mu4e-headers-search-bookmark?
"All evil-mu4e bindings.") "All evil-mu4e bindings.")
@ -233,10 +238,7 @@
;; closures in which we must use `evil-define-key*' instead of ;; closures in which we must use `evil-define-key*' instead of
;; `evil-define-key'. ;; `evil-define-key'.
(dolist (binding evil-collection-mu4e-mode-map-bindings) (dolist (binding evil-collection-mu4e-mode-map-bindings)
(evil-collection-define-key 'normal (apply #'evil-collection-define-key 'normal binding))
(nth 0 binding) (nth 1 binding) (nth 2 binding)))
(when evil-want-C-u-scroll
(evil-define-key 'normal mu4e-view-mode-map "\C-u" evil-scroll-up))
(evil-define-key 'operator mu4e-view-mode-map (evil-define-key 'operator mu4e-view-mode-map
"u" '(menu-item "u" '(menu-item
"" ""