Change 'set-keys' to 'setup' in function names
This commit is contained in:
parent
2c0d846d8e
commit
0dcc0cd290
|
@ -31,7 +31,7 @@
|
|||
(require 'ag)
|
||||
(require 'evil)
|
||||
|
||||
(defun evil-ag-set-keys ()
|
||||
(defun evil-ag-setup ()
|
||||
(evil-add-hjkl-bindings ag-mode-map 'normal
|
||||
"gg" #'evil-goto-first-line
|
||||
"gr" #'recompile
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
(require 'bookmark)
|
||||
(require 'evil-collection-util)
|
||||
|
||||
(defun evil-bookmark-set-keys ()
|
||||
(defun evil-bookmark-setup ()
|
||||
(+evilify-map
|
||||
bookmark-bmenu-mode-map
|
||||
:mode bookmark-bmenu-mode))
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
(require 'calendar)
|
||||
|
||||
;;;###autoload
|
||||
(defun evil-calendar-set-keys ()
|
||||
(defun evil-calendar-setup ()
|
||||
(evil-define-key 'motion calendar-mode-map
|
||||
;; motion
|
||||
"h" 'calendar-backward-day
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
(require 'cider)
|
||||
(require 'evil-collection-util)
|
||||
|
||||
(defun evil-cider-set-keys ()
|
||||
(defun evil-cider-setup ()
|
||||
(+evil-bind-key (normal visual)
|
||||
(cider-mode-map)
|
||||
(kbd "gz") 'cider-switch-to-repl-buffer
|
||||
|
|
|
@ -93,7 +93,7 @@ instance:
|
|||
|
||||
(with-eval-after-load 'calendar
|
||||
(require 'evil-calendar)
|
||||
(evil-calendar-set-keys))"
|
||||
(evil-calendar-setup))"
|
||||
(interactive)
|
||||
(dolist (mode evil-collection-mode-list)
|
||||
(let ((m mode)
|
||||
|
@ -104,7 +104,7 @@ instance:
|
|||
(dolist (req reqs)
|
||||
(with-eval-after-load req
|
||||
(require (intern (concat "evil-" (symbol-name m))))
|
||||
(funcall (intern (concat "evil-" (symbol-name m) "-set-keys"))))))))
|
||||
(funcall (intern (concat "evil-" (symbol-name m) "-setup"))))))))
|
||||
|
||||
(provide 'evil-collection)
|
||||
;;; evil-collection.el ends here
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
(require 'evil-collection-util)
|
||||
(require 'compile)
|
||||
|
||||
(defun evil-compile-set-keys ()
|
||||
(defun evil-compile-setup ()
|
||||
(+evilify-map
|
||||
compilation-mode-map
|
||||
:mode compilation-mode
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
(require 'cus-edit)
|
||||
|
||||
;;;###autoload
|
||||
(defun evil-custom-set-keys ()
|
||||
(defun evil-custom-setup ()
|
||||
(evil-set-initial-state 'Custom-mode 'normal)
|
||||
|
||||
(evil-define-key 'normal custom-mode-map
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
(require 'evil)
|
||||
(require 'debbugs)
|
||||
|
||||
(defun evil-diff-mode-set-keys ()
|
||||
(defun evil-diff-mode-setup ()
|
||||
(evil-set-initial-state 'debbugs-gnu-mode 'motion)
|
||||
|
||||
(evil-define-key 'motion debbugs-gnu-mode-map
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
(require 'debug)
|
||||
|
||||
;;;###autoload
|
||||
(defun evil-debugger-set-keys ()
|
||||
(defun evil-debugger-setup ()
|
||||
(evil-set-initial-state 'debugger-mode 'motion)
|
||||
|
||||
(evil-define-key 'motion debugger-mode-map
|
||||
|
|
|
@ -89,7 +89,7 @@ current file instead."
|
|||
(diff-restrict-view arg)))
|
||||
|
||||
;;;###autoload
|
||||
(defun evil-diff-mode-set-keys ()
|
||||
(defun evil-diff-mode-setup ()
|
||||
(evil-define-key 'normal diff-mode-map
|
||||
;; motion
|
||||
(kbd "SPC") 'scroll-up-command
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
(require 'dired)
|
||||
(require 'evil-collection-util)
|
||||
|
||||
(defun evil-dired-set-keys ()
|
||||
(defun evil-dired-setup ()
|
||||
(evil-define-key 'normal dired-mode-map
|
||||
"j" 'evil-next-line
|
||||
"k" 'evil-previous-line
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
(require 'edebug)
|
||||
(require 'evil-collection-util)
|
||||
|
||||
(defun evil-edebug-set-keys ()
|
||||
(defun evil-edebug-setup ()
|
||||
(+evil-set-default-state-for-mode edebug-mode motion)
|
||||
|
||||
(evil-define-key 'motion 'edebug-mode-map
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
(require 'evil)
|
||||
(require 'elfeed)
|
||||
|
||||
(defun evil-elfeed-set-keys ()
|
||||
(defun evil-elfeed-setup ()
|
||||
(evil-set-initial-state 'elfeed-search-mode 'motion)
|
||||
|
||||
(evil-define-key 'motion elfeed-search-mode-map
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
(require 'evil-collection-util)
|
||||
(require 'elisp-refs)
|
||||
|
||||
(defun evil-elisp-refs-set-keys ()
|
||||
(defun evil-elisp-refs-setup ()
|
||||
(evil-define-key 'normal elisp-refs-mode-map
|
||||
(kbd "<tab>") #'elisp-refs-next-match
|
||||
(kbd "<backtab>") #'elisp-refs-prev-match
|
||||
|
|
|
@ -74,7 +74,7 @@ The return value is the yanked text."
|
|||
(evil-next-line)
|
||||
(evil-emms-playlist-mode-paste-before))
|
||||
|
||||
(defun evil-emms-set-keys ()
|
||||
(defun evil-emms-setup ()
|
||||
(advice-add 'emms-browser :after 'evil-emms-browser)
|
||||
(evil-set-initial-state 'emms-playlist-mode 'motion)
|
||||
|
||||
|
|
|
@ -47,7 +47,7 @@
|
|||
|
||||
;;; `eshell-mode-map' is reset when Eshell is initialized in `eshell-mode'. We
|
||||
;;; need to add bindings to `eshell-first-time-mode-hook'.
|
||||
(defun evil-eshell-set-keys-function ()
|
||||
(defun evil-eshell-setup-function ()
|
||||
(evil-define-key 'normal eshell-mode-map
|
||||
;; motion
|
||||
"[" 'eshell-previous-prompt
|
||||
|
@ -77,8 +77,8 @@
|
|||
|
||||
;; TODO: Compare this setup procedure with evil-ediff.
|
||||
;;;###autoload
|
||||
(defun evil-eshell-set-keys ()
|
||||
(add-hook 'eshell-first-time-mode-hook 'evil-eshell-set-keys-function))
|
||||
(defun evil-eshell-setup ()
|
||||
(add-hook 'eshell-first-time-mode-hook 'evil-eshell-setup-function))
|
||||
|
||||
(provide 'evil-eshell)
|
||||
;;; evil-eshell.el ends here
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
(require 'evil-collection-util)
|
||||
(require 'flycheck)
|
||||
|
||||
(defun evil-flycheck-set-keys ()
|
||||
(defun evil-flycheck-setup ()
|
||||
(+evilify-map
|
||||
flycheck-error-list-mode-map
|
||||
:mode flycheck-error-list-mode
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
(require 'evil-collection-util)
|
||||
(require 'ggtags)
|
||||
|
||||
(defun evil-ggtags-set-keys ()
|
||||
(defun evil-ggtags-setup ()
|
||||
(+evilify-map
|
||||
ggtags-global-mode-map
|
||||
:mode ggtags-global-mode)
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
;; down the file system hierarchy since we need them to use it to edit the
|
||||
;; minibuffer content.
|
||||
|
||||
(defun evil-helm-set-keys ()
|
||||
(defun evil-helm-setup ()
|
||||
;; TODO: We should not modify helm-map in Emacs state but somehow it does not
|
||||
;; work otherwise.
|
||||
(define-key helm-map (kbd "M-h") 'helm-next-source)
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
(require 'help-mode)
|
||||
(require 'evil)
|
||||
|
||||
(defun evil-help-set-keys ()
|
||||
(defun evil-help-setup ()
|
||||
(evil-define-key 'motion help-mode-map
|
||||
;; motion
|
||||
(kbd "SPC") 'scroll-up-command
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
(require 'evil-collection-util)
|
||||
(require 'ibuffer)
|
||||
|
||||
(defun evil-ibuffer-set-keys ()
|
||||
(defun evil-ibuffer-setup ()
|
||||
(+evilify-map
|
||||
ibuffer-mode-map
|
||||
:mode ibuffer-mode
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
(require 'evil)
|
||||
(require 'image+)
|
||||
|
||||
(defun evil-image+-set-keys ()
|
||||
(defun evil-image+-setup ()
|
||||
(evil-define-key 'motion image-mode-map
|
||||
"+" 'imagex-sticky-zoom-in
|
||||
"-" 'imagex-sticky-zoom-out
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
(require 'image-mode)
|
||||
|
||||
;;;###autoload
|
||||
(defun evil-image-set-keys ()
|
||||
(defun evil-image-setup ()
|
||||
(evil-set-initial-state 'image-mode 'motion)
|
||||
|
||||
(evil-define-key 'motion image-mode-map
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
(require 'info)
|
||||
|
||||
;;;###autoload
|
||||
(defun evil-info-set-keys ()
|
||||
(defun evil-info-setup ()
|
||||
(evil-define-key 'motion Info-mode-map
|
||||
;; motion: Restore some Evil keys that got overriden.
|
||||
"w" 'evil-forward-word-begin
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
(require 'evil)
|
||||
(require 'ivy)
|
||||
|
||||
(defun evil-ivy-set-keys ()
|
||||
(defun evil-ivy-setup ()
|
||||
(evil-define-key 'normal ivy-occur-mode-map
|
||||
[mouse-1] 'ivy-occur-click
|
||||
(kbd "RET") 'ivy-occur-press-and-switch
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
(require 'evil-collection-util)
|
||||
(require 'macrostep)
|
||||
|
||||
(defun evil-macrostep-set-keys ()
|
||||
(defun evil-macrostep-setup ()
|
||||
;; Keymaps don't seem to be populated on first try.
|
||||
;; Force `evil' to normalize keymaps.
|
||||
(add-hook 'macrostep-mode-hook #'evil-normalize-keymaps)
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
(require 'man)
|
||||
|
||||
;;;###autoload
|
||||
(defun evil-man-set-keys ()
|
||||
(defun evil-man-setup ()
|
||||
(evil-define-key 'motion Man-mode-map
|
||||
;; motion
|
||||
(kbd "SPC") 'scroll-up-command
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
(when (> emacs-major-version 25)
|
||||
(require 'replace))
|
||||
|
||||
(defun evil-occur-set-keys ()
|
||||
(defun evil-occur-setup ()
|
||||
(setq evil-emacs-state-modes
|
||||
(remove 'occur-mode evil-emacs-state-modes))
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
(require 'outline)
|
||||
|
||||
;;;###autoload
|
||||
(defun evil-outline-set-keys ()
|
||||
(defun evil-outline-setup ()
|
||||
(evil-define-key 'normal outline-mode-map
|
||||
;; folding
|
||||
;; Evil default keys:
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
(require 'evil-collection-util)
|
||||
(require 'p4)
|
||||
|
||||
(defun evil-p4-set-keys ()
|
||||
(defun evil-p4-setup ()
|
||||
(+evilify-map
|
||||
p4-basic-mode-map
|
||||
:mode p4-basic-mode
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
(require 'package)
|
||||
|
||||
;;;###autoload
|
||||
(defun evil-package-menu-set-keys ()
|
||||
(defun evil-package-menu-setup ()
|
||||
(evil-set-initial-state 'package-menu-mode 'motion)
|
||||
|
||||
(evil-define-key 'motion package-menu-mode-map
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
(require 'evil-collection-util)
|
||||
(require 'pass)
|
||||
|
||||
(defun evil-pass-set-keys ()
|
||||
(defun evil-pass-setup ()
|
||||
(+evilify-map
|
||||
pass-mode-map
|
||||
:mode pass-mode
|
||||
|
|
|
@ -48,7 +48,7 @@
|
|||
(pdf-view-goto-page page)
|
||||
(pdf-view-first-page)))
|
||||
|
||||
(defun evil-pdf-set-keys ()
|
||||
(defun evil-pdf-setup ()
|
||||
(evil-set-initial-state 'pdf-view-mode 'motion)
|
||||
(evil-define-key 'motion pdf-view-mode-map
|
||||
;; motion
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
(require 'proced)
|
||||
|
||||
;;;###autoload
|
||||
(defun evil-proced-set-keys ()
|
||||
(defun evil-proced-setup ()
|
||||
(evil-set-initial-state 'proced-mode 'motion)
|
||||
|
||||
(evil-define-key 'motion proced-mode-map
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
(require 'evil-collection-util)
|
||||
(require 'prodigy)
|
||||
|
||||
(defun evil-prodigy-set-keys ()
|
||||
(defun evil-prodigy-setup ()
|
||||
(+evilify-map
|
||||
prodigy-mode-map
|
||||
:mode prodigy-mode
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
(require 'evil)
|
||||
(require 'profiler)
|
||||
|
||||
(defun evil-profiler-set-keys ()
|
||||
(defun evil-profiler-setup ()
|
||||
(evil-set-initial-state 'profiler-report-mode 'motion)
|
||||
|
||||
(evil-define-key 'motion profiler-report-mode-map
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
(require 'evil-collection-util)
|
||||
(require 'slime)
|
||||
|
||||
(defun evil-collection-set-keys ()
|
||||
(defun evil-collection-setup ()
|
||||
(+evilify-map
|
||||
sldb-mode-map
|
||||
:mode sldb-mode
|
||||
|
|
|
@ -66,7 +66,7 @@ it is not appropriate in some cases like terminals."
|
|||
(add-hook 'evil-insert-state-entry-hook 'evil-term-char-mode-entry-function)
|
||||
(add-hook 'evil-insert-state-exit-hook 'term-line-mode))
|
||||
|
||||
(defun evil-term-set-keys ()
|
||||
(defun evil-term-setup ()
|
||||
(evil-set-initial-state 'term-mode 'insert)
|
||||
(add-hook 'term-mode-hook 'evil-term-sync-state-and-mode)
|
||||
(add-hook 'term-mode-hook 'evil-term-escape-stay)
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
(require 'evil)
|
||||
(require 'transmission)
|
||||
|
||||
(defun evil-transmission-set-keys ()
|
||||
(defun evil-transmission-setup ()
|
||||
(evil-set-initial-state 'transmission-mode 'motion)
|
||||
(evil-define-key 'motion transmission-mode-map
|
||||
;; motion
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
(require 'vlf)
|
||||
|
||||
;;; Code:
|
||||
(defun evil-vlf-set-keys ()
|
||||
(defun evil-vlf-setup ()
|
||||
(+evilify-map
|
||||
vlf-mode-map
|
||||
:mode vlf-mode
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
(require 'evil-man) ; WoMan's keymap inherits from Man.
|
||||
|
||||
;;;###autoload
|
||||
(defun evil-woman-set-keys ()
|
||||
(defun evil-woman-setup ()
|
||||
(evil-define-key 'motion woman-mode-map
|
||||
(kbd "]") 'WoMan-next-manpage
|
||||
(kbd "[") 'WoMan-previous-manpage
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
(require 'evil-collection-util)
|
||||
(require 'xref)
|
||||
|
||||
(defun evil-xref-set-keys ()
|
||||
(defun evil-xref-setup ()
|
||||
(+evilify-map
|
||||
xref--xref-buffer-mode-map
|
||||
:mode xref--xref-buffer-mode
|
||||
|
|
|
@ -41,7 +41,7 @@ the default bindings to change in the future.
|
|||
|
||||
or mode-by-mode, for instance:
|
||||
|
||||
: (with-eval-after-load 'calendar (require 'evil-calendar) (evil-calendar-set-keys))
|
||||
: (with-eval-after-load 'calendar (require 'evil-calendar) (evil-calendar-setup))
|
||||
|
||||
The list of supported modes is simply the list of files.
|
||||
|
||||
|
|
Loading…
Reference in New Issue