Refactor menu-items to use evil-collection-define-operator-key
This commit is contained in:
parent
e52dfbeb68
commit
a3f8d1b4c9
|
@ -107,16 +107,9 @@
|
|||
"ZQ" 'elfeed-kill-buffer
|
||||
"ZZ" 'elfeed-kill-buffer)
|
||||
|
||||
(evil-collection-define-key 'operator 'elfeed-show-mode-map
|
||||
;; Like `eww'.
|
||||
"u" '(menu-item
|
||||
""
|
||||
nil
|
||||
:filter (lambda (&optional _)
|
||||
(when (memq evil-this-operator
|
||||
evil-collection-yank-operators)
|
||||
(setq evil-inhibit-operator t)
|
||||
#'elfeed-show-yank)))))
|
||||
;; yu, like `eww'
|
||||
(evil-collection-define-operator-key 'yank 'elfeed-show-mode-map
|
||||
"u" 'elfeed-show-yank))
|
||||
|
||||
(provide 'evil-collection-elfeed)
|
||||
;;; evil-collection-elfeed.el ends here
|
||||
|
|
|
@ -89,15 +89,8 @@
|
|||
"ZQ" 'quit-window
|
||||
"ZZ" 'quit-window)
|
||||
|
||||
(evil-collection-define-key 'operator 'eww-mode-map
|
||||
"u" '(menu-item
|
||||
""
|
||||
nil
|
||||
:filter (lambda (&optional _)
|
||||
(when (memq evil-this-operator
|
||||
evil-collection-yank-operators)
|
||||
(setq evil-inhibit-operator t)
|
||||
#'eww-copy-page-url))))
|
||||
(evil-collection-define-operator-key 'yank 'eww-mode-map
|
||||
"u" 'eww-copy-page-url)
|
||||
|
||||
(evil-collection-set-readonly-bindings 'eww-history-mode-map)
|
||||
(evil-set-initial-state 'eww-history-mode 'normal)
|
||||
|
@ -128,15 +121,8 @@
|
|||
;; refresh
|
||||
"gr" 'revert-buffer)
|
||||
|
||||
(evil-collection-define-key 'operator 'eww-bookmark-mode-map
|
||||
"u" '(menu-item
|
||||
""
|
||||
nil
|
||||
:filter (lambda (&optional _)
|
||||
(when (memq evil-this-operator
|
||||
evil-collection-yank-operators)
|
||||
(setq evil-inhibit-operator t)
|
||||
#'eww-copy-page-url)))))
|
||||
(evil-collection-define-operator-key 'yank 'eww-bookmark-mode-map
|
||||
"u" 'eww-copy-page-url))
|
||||
|
||||
(provide 'evil-collection-eww)
|
||||
;;; evil-collection-eww.el ends here
|
||||
|
|
|
@ -113,15 +113,9 @@
|
|||
"0" 'evil-digit-argument-or-evil-beginning-of-line
|
||||
"gg" 'evil-goto-first-line)
|
||||
|
||||
(evil-collection-define-key 'operator 'Info-mode-map
|
||||
"u" '(menu-item ; Like eww.
|
||||
""
|
||||
nil
|
||||
:filter (lambda (&optional _)
|
||||
(when (memq evil-this-operator
|
||||
evil-collection-yank-operators)
|
||||
(setq evil-inhibit-operator t)
|
||||
#'Info-copy-current-node-name)))))
|
||||
;; yu, Like eww.
|
||||
(evil-collection-define-operator-key 'yank 'Info-mode-map
|
||||
"u" 'Info-copy-current-node-name))
|
||||
|
||||
(provide 'evil-collection-info)
|
||||
;;; evil-collection-info.el ends here
|
||||
|
|
|
@ -259,15 +259,10 @@
|
|||
"G" 'mu4e-compose-goto-bottom)
|
||||
(evil-set-command-property 'mu4e-compose-goto-bottom :keep-visual t)
|
||||
(evil-set-command-property 'mu4e-compose-goto-top :keep-visual t)
|
||||
(evil-collection-define-key 'operator 'mu4e-view-mode-map
|
||||
"u" '(menu-item
|
||||
""
|
||||
nil
|
||||
:filter (lambda (&optional _)
|
||||
(when (memq evil-this-operator
|
||||
'(evil-yank evil-cp-yank evil-sp-yank lispyville-yank))
|
||||
(setq evil-inhibit-operator t)
|
||||
#'mu4e-view-save-url)))))
|
||||
|
||||
;; yu
|
||||
(evil-collection-define-operator-key 'mu4e-view-mode-map
|
||||
"u" 'mu4e-view-save-url))
|
||||
|
||||
|
||||
;;; Update mu4e-main-view
|
||||
|
|
|
@ -227,29 +227,13 @@
|
|||
"+" 'notmuch-search-add-tag
|
||||
(kbd "RET") 'notmuch-search-show-thread))
|
||||
|
||||
(evil-collection-define-key 'operator 'notmuch-search-mode-map
|
||||
;; Like `eww'.
|
||||
"s"
|
||||
`(menu-item
|
||||
""
|
||||
nil
|
||||
:filter (lambda (&optional _)
|
||||
(when (memq evil-this-operator
|
||||
evil-collection-yank-operators)
|
||||
(setq evil-inhibit-operator t)
|
||||
#'notmuch-search-stash-map))))
|
||||
;; ys
|
||||
(evil-collection-define-operator-key 'yank 'notmuch-search-mode-map
|
||||
"s" 'notmuch-search-stash-map)
|
||||
|
||||
(evil-collection-define-key 'operator 'notmuch-show-mode-map
|
||||
;; Like `eww'.
|
||||
"s"
|
||||
`(menu-item
|
||||
""
|
||||
nil
|
||||
:filter (lambda (&optional _)
|
||||
(when (memq evil-this-operator
|
||||
evil-collection-yank-operators)
|
||||
(setq evil-inhibit-operator t)
|
||||
#'notmuch-show-stash-map)))))
|
||||
;; ys
|
||||
(evil-collection-define-operator-key 'yank 'notmuch-show-mode-map
|
||||
"s" 'notmuch-show-stash-map))
|
||||
|
||||
(provide 'evil-collection-notmuch)
|
||||
;;; evil-collection-notmuch.el ends here
|
||||
|
|
|
@ -145,17 +145,9 @@
|
|||
"P" 'transmission-set-bandwidth-priority
|
||||
"r" 'transmission-move)
|
||||
|
||||
(evil-collection-define-key 'operator 'transmission-info-mode-map
|
||||
;; Like `eww'.
|
||||
"u" '(menu-item
|
||||
""
|
||||
nil
|
||||
:filter (lambda (&optional _)
|
||||
(when (memq evil-this-operator
|
||||
evil-collection-yank-operators)
|
||||
(setq evil-inhibit-operator t)
|
||||
#'transmission-copy-magnet))))
|
||||
|
||||
;; yu, Like `eww'.
|
||||
(evil-collection-define-operator-key 'yank 'transmission-info-mode-map
|
||||
"u" 'transmission-copy-magnet)
|
||||
|
||||
(evil-collection-set-readonly-bindings 'transmission-peers-mode-map)
|
||||
(evil-set-initial-state 'transmission-peers-mode 'normal)
|
||||
|
|
|
@ -30,30 +30,24 @@
|
|||
(require 'vdiff nil t)
|
||||
(require 'evil-collection)
|
||||
|
||||
(defconst evil-collection-vdiff-maps '(vdiff-mode-map
|
||||
vdiff-3way-mode-map))
|
||||
|
||||
;;;###autoload
|
||||
(defun evil-collection-vdiff-setup ()
|
||||
"Set up `evil' bindings for `vdiff-mode'."
|
||||
(dolist (mode '(vdiff-mode vdiff-3way-mode))
|
||||
(evil-define-minor-mode-key 'normal mode
|
||||
(add-hook 'vdiff-mode-hook 'evil-normalize-keymaps)
|
||||
(add-hook 'vdiff-3way-mode-hook 'evil-normalize-keymaps)
|
||||
|
||||
(dolist (keymap evil-collection-vdiff-maps)
|
||||
(evil-collection-define-key 'normal keymap
|
||||
"]c" 'vdiff-next-hunk
|
||||
"[c" 'vdiff-previous-hunk)
|
||||
|
||||
;; define `do' (diff obtain) and `dp' (diff put) bindings
|
||||
(evil-define-minor-mode-key 'operator mode
|
||||
"o" '(menu-item
|
||||
""
|
||||
nil
|
||||
:filter (lambda (&optional _)
|
||||
(when (memq evil-this-operator
|
||||
evil-collection-delete-operators)
|
||||
#'vdiff-receive-changes)))
|
||||
"p" '(menu-item
|
||||
""
|
||||
nil
|
||||
:filter (lambda (&optional _)
|
||||
(when (memq evil-this-operator
|
||||
evil-collection-delete-operators)
|
||||
#'vdiff-send-changes))))))
|
||||
(evil-collection-define-operator-key 'delete keymap
|
||||
"o" 'vdiff-receive-changes
|
||||
"p" 'vdiff-send-changes)))
|
||||
|
||||
(provide 'evil-collection-vdiff)
|
||||
|
||||
|
|
|
@ -77,24 +77,11 @@
|
|||
"ZQ" 'w3m-quit
|
||||
"ZZ" 'quit-window)
|
||||
|
||||
(evil-collection-define-key 'operator 'w3m-mode-map
|
||||
"t" '(menu-item
|
||||
""
|
||||
nil
|
||||
:filter (lambda (&optional _)
|
||||
(when (memq evil-this-operator
|
||||
evil-collection-yank-operators)
|
||||
(setq evil-inhibit-operator t)
|
||||
#'w3m-print-this-url))))
|
||||
(evil-collection-define-key 'operator 'w3m-mode-map
|
||||
"u" '(menu-item
|
||||
""
|
||||
nil
|
||||
:filter (lambda (&optional _)
|
||||
(when (memq evil-this-operator
|
||||
evil-collection-yank-operators)
|
||||
(setq evil-inhibit-operator t)
|
||||
#'w3m-print-current-url)))))
|
||||
(evil-collection-define-operator-key 'yank 'w3m-mode-map
|
||||
;; yt
|
||||
"t" 'w3m-print-this-url
|
||||
;; yu
|
||||
"u" 'w3m-print-current-url))
|
||||
|
||||
(provide 'evil-collection-w3m)
|
||||
;;; evil-collection-w3m.el ends here
|
||||
|
|
Loading…
Reference in New Issue