branch: elpa/evil-collection
commit 8ee297347bad0a61b32846ef9c73b4076ee958c4
Author: Stefan Monnier <[email protected]>
Commit: James Nguyen <[email protected]>
Apply a few tweaks for NonGNU
---
.elpaignore | 1 +
.gitignore | 4 ++
evil-collection.el | 78 +++++++++-------------
.../evil-collection-auto-package-update.el | 2 +-
modes/cider/evil-collection-cider.el | 8 +--
modes/company/evil-collection-company.el | 2 +-
modes/dashboard/evil-collection-dashboard.el | 2 +-
modes/diff-hl/evil-collection-diff-hl.el | 4 +-
modes/diff-mode/evil-collection-diff-mode.el | 2 +-
modes/distel/evil-collection-distel.el | 2 +-
modes/eca/evil-collection-eca.el | 2 +-
modes/ediff/evil-collection-ediff.el | 8 +--
modes/eglot/evil-collection-eglot.el | 2 +-
modes/eldoc/evil-collection-eldoc.el | 2 +-
modes/elisp-mode/evil-collection-elisp-mode.el | 14 ++--
modes/emms/evil-collection-emms.el | 2 +-
modes/eshell/evil-collection-eshell.el | 8 +--
modes/eval-sexp-fu/evil-collection-eval-sexp-fu.el | 6 +-
modes/evil-mc/evil-collection-evil-mc.el | 50 +++++++-------
modes/geiser/evil-collection-geiser.el | 4 +-
modes/helm/evil-collection-helm.el | 4 +-
modes/lispy/evil-collection-lispy.el | 2 +-
modes/lms/evil-collection-lms.el | 4 +-
modes/magit-repos/evil-collection-magit-repos.el | 2 +-
modes/magit-todos/evil-collection-magit-todos.el | 4 +-
modes/magit/evil-collection-magit.el | 24 +++----
modes/minibuffer/evil-collection-minibuffer.el | 2 +-
modes/monky/evil-collection-monky.el | 4 +-
.../evil-collection-mu4e-conversation.el | 4 +-
modes/mu4e/evil-collection-mu4e-1.8.el | 6 +-
modes/p-search/evil-collection-p-search.el | 2 +-
modes/pass/evil-collection-pass.el | 2 +-
modes/pdf/evil-collection-pdf.el | 2 +-
modes/scroll-lock/evil-collection-scroll-lock.el | 2 +-
modes/simple-mpc/evil-collection-simple-mpc.el | 6 +-
modes/slime/evil-collection-slime.el | 8 +--
modes/sly/evil-collection-sly.el | 8 +--
modes/term/evil-collection-term.el | 8 +--
modes/unimpaired/evil-collection-unimpaired.el | 5 +-
modes/vdiff/evil-collection-vdiff.el | 4 +-
modes/view/evil-collection-view.el | 2 +-
test/evil-collection-magit-tests.el | 5 +-
test/evil-collection-test.el | 2 +-
test/test-helper.el | 2 +-
44 files changed, 152 insertions(+), 165 deletions(-)
diff --git a/.elpaignore b/.elpaignore
new file mode 100644
index 0000000000..9daeafb986
--- /dev/null
+++ b/.elpaignore
@@ -0,0 +1 @@
+test
diff --git a/.gitignore b/.gitignore
index 58243397ab..55199d1f6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,7 @@
/.eask
/dist
*.elc
+
+# ELPA-generated files.
+/evil-collection-autoloads.el
+/evil-collection-pkg.el
diff --git a/evil-collection.el b/evil-collection.el
index 25c678510c..2cebbe3b63 100644
--- a/evil-collection.el
+++ b/evil-collection.el
@@ -97,13 +97,11 @@ See https://github.com/emacs-evil/evil-collection/issues/60
for more details.")
(defcustom evil-collection-setup-minibuffer nil
"Whether to setup Evil bindings in the minibuffer."
- :type 'boolean
- :group 'evil-collection)
+ :type 'boolean)
(defcustom evil-collection-calendar-want-org-bindings nil
"Whether to bind Org functions in calendar keymap."
- :type 'boolean
- :group 'evil-collection)
+ :type 'boolean)
(defcustom evil-collection-setup-debugger-keys t
"Whether to bind debugger keys when debugger is active.
@@ -121,8 +119,7 @@ This variable is obsolete; new customization should use
(setq evil-collection-binding-overrides
\\='((debug-breakpoint :enabled nil)))"
- :type 'boolean
- :group 'evil-collection)
+ :type 'boolean)
(make-obsolete-variable 'evil-collection-setup-debugger-keys
"use `evil-collection-binding-overrides':
`debug-continue', `debug-step-over', `debug-step-into', `debug-step-out',
`debug-breakpoint'."
@@ -130,8 +127,7 @@ This variable is obsolete; new customization should use
(defcustom evil-collection-want-unimpaired-p t
"Whether to enable unimpaired style bindings globally."
- :type 'boolean
- :group 'evil-collection)
+ :type 'boolean)
(defcustom evil-collection-want-find-usages-bindings t
"Whether to bind `xref-find-references'-like bindings.
@@ -143,8 +139,7 @@ should use `evil-collection-binding-overrides' instead:
(setq evil-collection-binding-overrides
\\='((find-usages :enabled nil)))"
- :type 'boolean
- :group 'evil-collection)
+ :type 'boolean)
(make-obsolete-variable 'evil-collection-want-find-usages-bindings
"use `evil-collection-binding-overrides':
`find-usages'."
@@ -152,8 +147,7 @@ should use `evil-collection-binding-overrides' instead:
(defcustom evil-collection-want-g-bindings t
"Whether to bind g* bindings."
- :type 'boolean
- :group 'evil-collection)
+ :type 'boolean)
(defvar evil-collection--modes-with-delayed-setup
`(emms
@@ -178,16 +172,14 @@ read and `evil-collection-setup-hook' will be ran in the
"Whether to always run `evil-collection-setup-hook' after mode is loaded.
See `evil-collection-init' and `evil-collection--modes-with-delayed-setup'."
- :type 'boolean
- :group 'evil-collection)
+ :type 'boolean)
(defcustom evil-collection-defer-delay 3
"Default idle delay in seconds used when deferring mode initialization.
Used as a fallback when no explicit delay is specified for a mode in
`evil-collection-defer'."
- :type 'number
- :group 'evil-collection)
+ :type 'number)
(defvar evil-collection--supported-modes
`(2048-game
@@ -434,8 +426,7 @@ mode symbol and `cdr' the packages to register.
By default, `minibuffer' is not included because many users find
this confusing. It will be included if
`evil-collection-setup-minibuffer' is set to t."
- :type '(repeat (choice symbol sexp))
- :group 'evil-collection)
+ :type '(repeat (choice symbol sexp)))
(defcustom evil-collection-config
'((buff-menu :defer t)
@@ -474,28 +465,24 @@ Currently supported keys:
:hook HOOK-NAME to initialize the mode when a hook fires. The hook
name does not need the \"-hook\" suffix; it will be appended
automatically. When :hook is present, :defer is ignored."
- :type '(repeat (choice symbol sexp))
- :group 'evil-collection)
+ :type '(repeat (choice symbol sexp)))
(defcustom evil-collection-key-whitelist '()
"List of keys that may be used by Evil Collection.
This is a list of strings that are suitable for input to
`kbd'. If there are no keys in the list, the whitelist will be ignored."
- :type '(repeat string)
- :group 'evil-collection)
+ :type '(repeat string))
(defcustom evil-collection-key-blacklist '()
"List of keys that may not be used by Evil Collection.
This is a list of strings that are suitable for input to `kbd'."
- :type '(repeat string)
- :group 'evil-collection)
+ :type '(repeat string))
(defcustom evil-collection-state-passlist '()
"List of evil states that may be used by Evil Collection.
This is a list of symbols that are suitable for input to
`evil-define-key'. Ignore when there are no states in the list."
- :type '(repeat symbol)
- :group 'evil-collection)
+ :type '(repeat symbol))
(defcustom evil-collection-state-denylist
(if (bound-and-true-p evil-disable-insert-state-bindings)
@@ -504,8 +491,7 @@ This is a list of symbols that are suitable for input to
"List of evil states that may not be used by Evil Collection.
This is a list of symbols that are suitable for input to
`evil-define-key'."
- :type '(repeat symbol)
- :group 'evil-collection)
+ :type '(repeat symbol))
(defcustom evil-collection-repl-submit-state 'normal
"Evil state in which RET submits the prompt in REPL-like buffers.
@@ -522,8 +508,7 @@ New customization should use
\\='((repl-submit :state insert)
(repl-newline :state normal)))"
:type '(choice (const :tag "Submit in normal state" normal)
- (const :tag "Submit in insert state" insert))
- :group 'evil-collection)
+ (const :tag "Submit in insert state" insert)))
(make-obsolete-variable 'evil-collection-repl-submit-state
"use `evil-collection-binding-overrides':
`repl-submit', `repl-newline'."
@@ -694,8 +679,7 @@ defaults.
Use `:enabled nil' to disable a feature. An explicit nil counts as
\"set\", not \"absent\"."
- :type '(alist :key-type symbol :value-type plist)
- :group 'evil-collection)
+ :type '(alist :key-type symbol :value-type plist))
(defun evil-collection-binding--get (id prop)
"Resolve PROP for theme entry ID.
@@ -856,8 +840,8 @@ description."
Like `evil-collection-bind' but uses `evil-local-set-key'."
(let ((keys (evil-collection-binding-keys id nil command)))
(when (evil-collection-binding-enabled-p id nil keys command)
- (let ((whitelist (mapcar 'kbd evil-collection-key-whitelist))
- (blacklist (mapcar 'kbd evil-collection-key-blacklist))
+ (let ((whitelist (mapcar #'kbd evil-collection-key-whitelist))
+ (blacklist (mapcar #'kbd evil-collection-key-blacklist))
(states (evil-collection--filter-states
(evil-collection-binding-states id nil keys command))))
(when states
@@ -904,8 +888,8 @@ binding in `annalist' as so."
'evil-collection-yank-operators
'evil-collection-delete-operators))
(remap (if (eq operator 'yank) [remap evil-yank] [remap evil-delete]))
- (whitelist (mapcar 'kbd evil-collection-key-whitelist))
- (blacklist (mapcar 'kbd evil-collection-key-blacklist))
+ (whitelist (mapcar #'kbd evil-collection-key-whitelist))
+ (blacklist (mapcar #'kbd evil-collection-key-blacklist))
filtered-bindings)
(while bindings
(let* ((key (pop bindings))
@@ -959,8 +943,8 @@ unquoted keymap required for `evil-define-key*'. This
function adds the ability
to filter keys on the basis of `evil-collection-key-whitelist' and
`evil-collection-key-blacklist'. It also records bindings with annalist.el."
(declare (indent defun))
- (let* ((whitelist (mapcar 'kbd evil-collection-key-whitelist))
- (blacklist (mapcar 'kbd evil-collection-key-blacklist))
+ (let* ((whitelist (mapcar #'kbd evil-collection-key-whitelist))
+ (blacklist (mapcar #'kbd evil-collection-key-blacklist))
(states-to-bind (evil-collection--filter-states state))
filtered-bindings)
(when (or states-to-bind (null state))
@@ -987,8 +971,8 @@ enabled without relying on `evil-normalize-keymaps'.
Filters keys via `evil-collection-key-whitelist' /
`evil-collection-key-blacklist' and records bindings with annalist."
(declare (indent defun))
- (let* ((whitelist (mapcar 'kbd evil-collection-key-whitelist))
- (blacklist (mapcar 'kbd evil-collection-key-blacklist))
+ (let* ((whitelist (mapcar #'kbd evil-collection-key-whitelist))
+ (blacklist (mapcar #'kbd evil-collection-key-blacklist))
(states-to-bind (evil-collection--filter-states state))
filtered-bindings)
(when (or states-to-bind (null state))
@@ -1008,8 +992,8 @@ Filters keys via `evil-collection-key-whitelist' /
(defun evil-collection-can-bind-key (key)
"Return whether or not we should bind KEY."
- (let* ((whitelist (mapcar 'kbd evil-collection-key-whitelist))
- (blacklist (mapcar 'kbd evil-collection-key-blacklist)))
+ (let* ((whitelist (mapcar #'kbd evil-collection-key-whitelist))
+ (blacklist (mapcar #'kbd evil-collection-key-blacklist)))
(evil-collection--can-bind-key key whitelist blacklist)))
(defun evil-collection--define-key (state map-sym bindings)
@@ -1231,7 +1215,7 @@ without creating/referencing a backup keymap."
(lookup-keymap (if (and (not destructive)
(boundp backup-keymap-symbol))
(symbol-value backup-keymap-symbol)
- (copy-keymap
+ (copy-keymap ;FIXME: Why copy?
(if state
(evil-get-minor-mode-keymap state mode-symbol)
keymap))))
@@ -1489,25 +1473,25 @@ instead of the modes in `evil-collection-mode-list'.
(eq evil-search-module 'evil-search))
(defvar evil-collection-evil-search-forward
- '(menu-item "" nil :filter (lambda (&optional _)
+ `(menu-item "" nil :filter ,(lambda (&optional _)
(if (eq evil-search-module 'evil-search)
#'evil-ex-search-forward
#'evil-search-forward))))
(defvar evil-collection-evil-search-backward
- '(menu-item "" nil :filter (lambda (&optional _)
+ `(menu-item "" nil :filter ,(lambda (&optional _)
(if (eq evil-search-module 'evil-search)
#'evil-ex-search-backward
#'evil-search-backward))))
(defvar evil-collection-evil-search-next
- '(menu-item "" nil :filter (lambda (&optional _)
+ `(menu-item "" nil :filter ,(lambda (&optional _)
(if (eq evil-search-module 'evil-search)
#'evil-ex-search-next
#'evil-search-next))))
(defvar evil-collection-evil-search-previous
- '(menu-item "" nil :filter (lambda (&optional _)
+ `(menu-item "" nil :filter ,(lambda (&optional _)
(if (eq evil-search-module 'evil-search)
#'evil-ex-search-previous
#'evil-search-previous))))
diff --git a/modes/auto-package-update/evil-collection-auto-package-update.el
b/modes/auto-package-update/evil-collection-auto-package-update.el
index 3a71c2c790..fa2932d13a 100644
--- a/modes/auto-package-update/evil-collection-auto-package-update.el
+++ b/modes/auto-package-update/evil-collection-auto-package-update.el
@@ -35,7 +35,7 @@
;;;###autoload
(defun evil-collection-auto-package-update-setup ()
"Set up `evil' bindings for `auto-package-update'."
- (add-hook 'auto-package-update-minor-mode-hook 'evil-normalize-keymaps)
+ (add-hook 'auto-package-update-minor-mode-hook #'evil-normalize-keymaps)
(evil-collection-bind 'auto-package-update-minor-mode-map 'quit
'quit-window))
(provide 'evil-collection-auto-package-update)
diff --git a/modes/cider/evil-collection-cider.el
b/modes/cider/evil-collection-cider.el
index 5e82670da3..08a686645e 100644
--- a/modes/cider/evil-collection-cider.el
+++ b/modes/cider/evil-collection-cider.el
@@ -91,11 +91,11 @@ ex. \(cider-debug-mode-send-reply \":next\"\)"
(defun evil-collection-cider-setup ()
"Set up `evil' bindings for `cider'."
(unless evil-move-beyond-eol
- (advice-add 'cider-eval-last-sexp :around 'evil-collection-cider-last-sexp)
- (advice-add 'cider-eval-last-sexp-and-replace :around
'evil-collection-cider-last-sexp)
- (advice-add 'cider-eval-last-sexp-to-repl :around
'evil-collection-cider-last-sexp)
+ (advice-add 'cider-eval-last-sexp :around
#'evil-collection-cider-last-sexp)
+ (advice-add 'cider-eval-last-sexp-and-replace :around
#'evil-collection-cider-last-sexp)
+ (advice-add 'cider-eval-last-sexp-to-repl :around
#'evil-collection-cider-last-sexp)
(with-eval-after-load 'cider-eval-sexp-fu
- (advice-add 'cider-esf--bounds-of-last-sexp :around
'evil-collection-cider-last-sexp)))
+ (advice-add 'cider-esf--bounds-of-last-sexp :around
#'evil-collection-cider-last-sexp)))
(when evil-collection-setup-debugger-keys
(add-hook 'cider-mode-hook #'evil-normalize-keymaps)
diff --git a/modes/company/evil-collection-company.el
b/modes/company/evil-collection-company.el
index 9083e82f3e..e5283034e0 100644
--- a/modes/company/evil-collection-company.el
+++ b/modes/company/evil-collection-company.el
@@ -142,7 +142,7 @@ C-x C-l."
;; Make `company-mode' not show popup when not in supported state
(advice-add 'company-call-backend
- :before-while 'evil-collection-company-supported-p))
+ :before-while #'evil-collection-company-supported-p))
(provide 'evil-collection-company)
diff --git a/modes/dashboard/evil-collection-dashboard.el
b/modes/dashboard/evil-collection-dashboard.el
index 997022c2cf..7cd8d7dc87 100644
--- a/modes/dashboard/evil-collection-dashboard.el
+++ b/modes/dashboard/evil-collection-dashboard.el
@@ -87,7 +87,7 @@
;; Despite the name, this function is what sets up the dashboard
;; buffer itself.
(advice-add 'dashboard-insert-startupify-lists :after
- 'evil-collection-dashboard-setup-jump-commands))
+ #'evil-collection-dashboard-setup-jump-commands))
(provide 'evil-collection-dashboard)
diff --git a/modes/diff-hl/evil-collection-diff-hl.el
b/modes/diff-hl/evil-collection-diff-hl.el
index da71770ed6..1e91caece8 100644
--- a/modes/diff-hl/evil-collection-diff-hl.el
+++ b/modes/diff-hl/evil-collection-diff-hl.el
@@ -48,7 +48,7 @@
;;;###autoload
(defun evil-collection-diff-hl-setup()
"Set up `evil' bindings for `diff-hl'."
- (add-hook 'diff-hl-show-hunk-inline-transient-mode-hook
'evil-normalize-keymaps)
+ (add-hook 'diff-hl-show-hunk-inline-transient-mode-hook
#'evil-normalize-keymaps)
(evil-collection-define-key 'normal
'diff-hl-show-hunk-inline-transient-mode-map
;; quit
@@ -59,7 +59,7 @@
"k" 'diff-hl-show-hunk-inline--popup-up
(kbd "C-f") 'diff-hl-show-hunk-inline--popup-pagedown
(kbd "C-b") 'diff-hl-show-hunk-inline--popup-pageup)
- (evil-collection-bind 'diff-hl-show-hunk-inline-transient-mode-map 'quit
'diff-hl-show-hunk-inline-hide)
+ (evil-collection-bind 'diff-hl-show-hunk-inline-transient-mode-map 'quit
#'diff-hl-show-hunk-inline-hide)
;; Actually `diff-hl-show-hunk-inline-transient-mode-map' will inherit it by
;; `set-keymap-parent'.
diff --git a/modes/diff-mode/evil-collection-diff-mode.el
b/modes/diff-mode/evil-collection-diff-mode.el
index 78e551d7d5..611b2682e9 100644
--- a/modes/diff-mode/evil-collection-diff-mode.el
+++ b/modes/diff-mode/evil-collection-diff-mode.el
@@ -116,7 +116,7 @@ current file instead."
"#" 'diff-ignore-whitespace-hunk))
;; Enable a separate minor mode so that we can bind keys to it.
- (add-hook 'diff-mode-hook 'evil-collection-diff-mode))
+ (add-hook 'diff-mode-hook #'evil-collection-diff-mode))
;;;###autoload
(defun evil-collection-diff-mode-setup ()
diff --git a/modes/distel/evil-collection-distel.el
b/modes/distel/evil-collection-distel.el
index bf54ee1a24..d9129d6d84 100644
--- a/modes/distel/evil-collection-distel.el
+++ b/modes/distel/evil-collection-distel.el
@@ -75,7 +75,7 @@
(evil-collection-bind 'erlang-extended-mode-map 'find-usages 'erl-who-calls)
- (add-hook 'erlang-extended-mode-hook 'evil-normalize-keymaps))
+ (add-hook 'erlang-extended-mode-hook #'evil-normalize-keymaps))
(provide 'evil-collection-distel)
;;; evil-collection-distel.el ends here
diff --git a/modes/eca/evil-collection-eca.el b/modes/eca/evil-collection-eca.el
index 0adfbf82c2..0b9bdc000e 100644
--- a/modes/eca/evil-collection-eca.el
+++ b/modes/eca/evil-collection-eca.el
@@ -36,7 +36,7 @@
;;;###autoload
(defun evil-collection-eca-setup ()
"Set up `evil' bindings for `eca'."
- (add-hook 'eca-chat-mode-hook 'evil-normalize-keymaps)
+ (add-hook 'eca-chat-mode-hook #'evil-normalize-keymaps)
(evil-collection-bind 'eca-chat-mode-map
'repl-submit 'eca-chat--key-pressed-return
diff --git a/modes/ediff/evil-collection-ediff.el
b/modes/ediff/evil-collection-ediff.el
index d66101b387..d2cdbaca71 100644
--- a/modes/ediff/evil-collection-ediff.el
+++ b/modes/ediff/evil-collection-ediff.el
@@ -171,8 +171,8 @@
(define-key ediff-mode-map (car entry) (cdr entry)))
(unless (or ediff-3way-comparison-job
(eq ediff-split-window-function 'split-window-vertically))
- (define-key ediff-mode-map "l" 'ediff-copy-A-to-B)
- (define-key ediff-mode-map "h" 'ediff-copy-B-to-A))
+ (define-key ediff-mode-map "l" #'ediff-copy-A-to-B)
+ (define-key ediff-mode-map "h" #'ediff-copy-B-to-A))
(evil-normalize-keymaps)
nil)
@@ -181,7 +181,7 @@
"Initialize evil-ediff."
(interactive)
(evil-set-initial-state 'ediff-mode 'normal)
- (add-hook 'ediff-keymap-setup-hook 'evil-collection-ediff-startup-hook)
+ (add-hook 'ediff-keymap-setup-hook #'evil-collection-ediff-startup-hook)
(evil-collection-ediff-adjust-help))
(defun evil-collection-ediff-revert ()
@@ -199,7 +199,7 @@
(ediff-long-help-message-tail .
ediff-long-help-message-tail-backup)))
(setf (symbol-value (car msg)) (symbol-value (cdr msg)))))
(setq evil-collection-ediff-help-changed nil)
- (remove-hook 'ediff-keymap-setup-hook 'evil-collection-ediff-startup-hook))
+ (remove-hook 'ediff-keymap-setup-hook #'evil-collection-ediff-startup-hook))
(provide 'evil-collection-ediff)
;;; evil-collection-ediff.el ends here
diff --git a/modes/eglot/evil-collection-eglot.el
b/modes/eglot/evil-collection-eglot.el
index 449645a093..4f5f2fa7f8 100644
--- a/modes/eglot/evil-collection-eglot.el
+++ b/modes/eglot/evil-collection-eglot.el
@@ -34,7 +34,7 @@
;;;###autoload
(defun evil-collection-eglot-setup ()
"Set up `evil' bindings for `eglot'."
- (add-hook 'eglot-managed-mode-hook 'evil-normalize-keymaps)
+ (add-hook 'eglot-managed-mode-hook #'evil-normalize-keymaps)
(evil-collection-define-key 'normal 'eglot-mode-map
"gD" 'xref-find-definitions-other-window
"g5" 'xref-find-definitions-other-frame)
diff --git a/modes/eldoc/evil-collection-eldoc.el
b/modes/eldoc/evil-collection-eldoc.el
index 29b646daae..ae3bc638ad 100644
--- a/modes/eldoc/evil-collection-eldoc.el
+++ b/modes/eldoc/evil-collection-eldoc.el
@@ -61,7 +61,7 @@
(when (< emacs-major-version 29)
;; Enable a separate minor mode so that we can bind keys to it.
(advice-add 'eldoc-doc-buffer
- :after 'evil-collection-eldoc-setup-doc-buffer-mode)))
+ :after #'evil-collection-eldoc-setup-doc-buffer-mode)))
(provide 'evil-collection-eldoc)
;;; evil-collection-eldoc.el ends here
diff --git a/modes/elisp-mode/evil-collection-elisp-mode.el
b/modes/elisp-mode/evil-collection-elisp-mode.el
index bd7c7bfc88..a5f4dd35e2 100644
--- a/modes/elisp-mode/evil-collection-elisp-mode.el
+++ b/modes/elisp-mode/evil-collection-elisp-mode.el
@@ -39,9 +39,9 @@ BEG and END are the start and end of the output in
current-buffer.
VALUE is the Lisp value printed, ALT1 and ALT2 are strings for the
alternative printed representations that can be displayed."
(let ((map (make-sparse-keymap)))
- (define-key map (kbd "C-m")
'evil-collection-elisp-mode-return-or-last-sexp-toggle-display)
- (define-key map [down-mouse-2] 'mouse-set-point)
- (define-key map [mouse-2] 'elisp-last-sexp-toggle-display)
+ (define-key map (kbd "C-m")
#'evil-collection-elisp-mode-return-or-last-sexp-toggle-display)
+ (define-key map [down-mouse-2] #'mouse-set-point)
+ (define-key map [mouse-2] #'elisp-last-sexp-toggle-display)
(add-text-properties
beg end
`(printed-value (,value ,alt1 ,alt2)
@@ -77,16 +77,16 @@ alternative printed representations that can be displayed."
;;;###autoload
(defun evil-collection-elisp-mode-setup ()
"Set up `evil' bindings for `elisp-mode'."
- (add-hook 'emacs-lisp-compilation-mode-hook 'evil-normalize-keymaps)
+ (add-hook 'emacs-lisp-compilation-mode-hook #'evil-normalize-keymaps)
(unless evil-move-beyond-eol
- (advice-add 'eval-print-last-sexp :around
'evil-collection-elisp-mode-last-sexp))
+ (advice-add 'eval-print-last-sexp :around
#'evil-collection-elisp-mode-last-sexp))
(advice-add 'last-sexp-setup-props
- :override 'evil-collection-elisp-mode-last-sexp-setup-props)
+ :override #'evil-collection-elisp-mode-last-sexp-setup-props)
(evil-set-initial-state 'emacs-lisp-mode 'normal)
- (evil-collection-bind 'emacs-lisp-compilation-mode-map 'refresh
'emacs-lisp-compilation-recompile)
+ (evil-collection-bind 'emacs-lisp-compilation-mode-map 'refresh
#'emacs-lisp-compilation-recompile)
(evil-collection-bind 'emacs-lisp-mode-map
'find-usages 'xref-find-references
diff --git a/modes/emms/evil-collection-emms.el
b/modes/emms/evil-collection-emms.el
index fcb8cbfbbb..cdf82aaf49 100644
--- a/modes/emms/evil-collection-emms.el
+++ b/modes/emms/evil-collection-emms.el
@@ -79,7 +79,7 @@ The return value is the yanked text."
;; TODO: Why doesn't evil-set-initial-state work with emms-browser-mode?
(evil-collection-inhibit-insert-state 'emms-browser-mode-map)
- (add-hook 'emms-browser-mode-hook 'evil-normal-state)
+ (add-hook 'emms-browser-mode-hook #'evil-normal-state)
(evil-collection-define-key 'normal 'emms-browser-mode-map
;; The following overrides other "g-" and "s-" prefixed keys so we set it
first.
"g" nil
diff --git a/modes/eshell/evil-collection-eshell.el
b/modes/eshell/evil-collection-eshell.el
index 17e11b0711..da32805dd0 100644
--- a/modes/eshell/evil-collection-eshell.el
+++ b/modes/eshell/evil-collection-eshell.el
@@ -43,7 +43,7 @@
(defun evil-collection-eshell-next-prompt-on-insert ()
"Go to next prompt on `evil' replace/insert enter."
(dolist (hook '(evil-replace-state-entry-hook evil-insert-state-entry-hook))
- (add-hook hook 'evil-collection-eshell-next-prompt nil t)))
+ (add-hook hook #'evil-collection-eshell-next-prompt nil t)))
(defun evil-collection-eshell-interrupt-process ()
"Interupt `eshell' process and enter insert state."
@@ -155,9 +155,9 @@ appropriate in some cases like terminals."
;;;###autoload
(defun evil-collection-eshell-setup ()
"Set up `evil' bindings for `eshell'."
- (add-hook 'eshell-mode-hook 'evil-collection-eshell-escape-stay)
- (add-hook 'eshell-mode-hook 'evil-collection-eshell-next-prompt-on-insert)
- (add-hook 'eshell-first-time-mode-hook 'evil-collection-eshell-setup-keys))
+ (add-hook 'eshell-mode-hook #'evil-collection-eshell-escape-stay)
+ (add-hook 'eshell-mode-hook #'evil-collection-eshell-next-prompt-on-insert)
+ (add-hook 'eshell-first-time-mode-hook #'evil-collection-eshell-setup-keys))
(provide 'evil-collection-eshell)
;;; evil-collection-eshell.el ends here
diff --git a/modes/eval-sexp-fu/evil-collection-eval-sexp-fu.el
b/modes/eval-sexp-fu/evil-collection-eval-sexp-fu.el
index b799faa420..08d04f89c6 100644
--- a/modes/eval-sexp-fu/evil-collection-eval-sexp-fu.el
+++ b/modes/eval-sexp-fu/evil-collection-eval-sexp-fu.el
@@ -45,17 +45,17 @@
(defun evil-collection-eval-sexp-fu-advise-bounds-of-thing-at-point (command
&rest args)
"Advise `bounds-of-thing-at-point' to handle `evil's `evil-move-beyond-eol'."
(advice-add 'bounds-of-thing-at-point
- :around
'evil-collection-eval-sexp-fu-bounds-of-thing-at-point-sexp)
+ :around
#'evil-collection-eval-sexp-fu-bounds-of-thing-at-point-sexp)
(apply command args)
(advice-remove 'bounds-of-thing-at-point
- 'evil-collection-eval-sexp-fu-bounds-of-thing-at-point-sexp))
+ #'evil-collection-eval-sexp-fu-bounds-of-thing-at-point-sexp))
;;;###autoload
(defun evil-collection-eval-sexp-fu-setup ()
"Set up `evil' with `eval-sexp-fu'."
(unless evil-move-beyond-eol
(advice-add 'ad-Advice-eval-last-sexp
- :around
'evil-collection-eval-sexp-fu-advise-bounds-of-thing-at-point)))
+ :around
#'evil-collection-eval-sexp-fu-advise-bounds-of-thing-at-point)))
(provide 'evil-collection-eval-sexp-fu)
;;; evil-collection-eval-sexp-fu.el ends here
diff --git a/modes/evil-mc/evil-collection-evil-mc.el
b/modes/evil-mc/evil-collection-evil-mc.el
index 5ef1d9ba69..a9f04f168b 100644
--- a/modes/evil-mc/evil-collection-evil-mc.el
+++ b/modes/evil-mc/evil-collection-evil-mc.el
@@ -41,31 +41,31 @@
(setcdr evil-mc-cursors-map nil)
- (define-key evil-mc-cursors-map (kbd "a") 'evil-mc-make-all-cursors)
- (define-key evil-mc-cursors-map (kbd "q") 'evil-mc-undo-all-cursors)
- (define-key evil-mc-cursors-map (kbd "u") 'evil-mc-undo-last-added-cursor)
-
- (define-key evil-mc-cursors-map (kbd "C-p") 'evil-mc-pause-cursors)
- (define-key evil-mc-cursors-map (kbd "C-r") 'evil-mc-resume-cursors)
- (define-key evil-mc-cursors-map (kbd "C-m") 'evil-mc-make-cursor-here)
-
- (define-key evil-mc-cursors-map (kbd "0")
'evil-mc-make-and-goto-first-cursor)
- (define-key evil-mc-cursors-map (kbd "$") 'evil-mc-make-and-goto-last-cursor)
-
- (define-key evil-mc-cursors-map (kbd "I")
'evil-mc-make-cursor-in-visual-selection-beg)
- (define-key evil-mc-cursors-map (kbd "A")
'evil-mc-make-cursor-in-visual-selection-end)
-
- (define-key evil-mc-cursors-map (kbd "o")
'evil-mc-make-cursor-move-next-line)
- (define-key evil-mc-cursors-map (kbd "O")
'evil-mc-make-cursor-move-prev-line)
-
- (define-key evil-mc-cursors-map (kbd "n") 'evil-mc-make-and-goto-next-match)
- (define-key evil-mc-cursors-map (kbd "N") 'evil-mc-make-and-goto-prev-match)
- (define-key evil-mc-cursors-map (kbd "C-n")
'evil-mc-skip-and-goto-next-match)
- (define-key evil-mc-cursors-map (kbd "C-S-n")
'evil-mc-skip-and-goto-prev-match)
- (define-key evil-mc-cursors-map (kbd "M-n")
'evil-mc-make-and-goto-next-cursor)
- (define-key evil-mc-cursors-map (kbd "M-N")
'evil-mc-make-and-goto-prev-cursor)
- (define-key evil-mc-cursors-map (kbd "C-u")
'evil-mc-skip-and-goto-next-cursor)
- (define-key evil-mc-cursors-map (kbd "C-S-u")
'evil-mc-skip-and-goto-prev-cursor)
+ (define-key evil-mc-cursors-map (kbd "a") #'evil-mc-make-all-cursors)
+ (define-key evil-mc-cursors-map (kbd "q") #'evil-mc-undo-all-cursors)
+ (define-key evil-mc-cursors-map (kbd "u") #'evil-mc-undo-last-added-cursor)
+
+ (define-key evil-mc-cursors-map (kbd "C-p") #'evil-mc-pause-cursors)
+ (define-key evil-mc-cursors-map (kbd "C-r") #'evil-mc-resume-cursors)
+ (define-key evil-mc-cursors-map (kbd "C-m") #'evil-mc-make-cursor-here)
+
+ (define-key evil-mc-cursors-map (kbd "0")
#'evil-mc-make-and-goto-first-cursor)
+ (define-key evil-mc-cursors-map (kbd "$")
#'evil-mc-make-and-goto-last-cursor)
+
+ (define-key evil-mc-cursors-map (kbd "I")
#'evil-mc-make-cursor-in-visual-selection-beg)
+ (define-key evil-mc-cursors-map (kbd "A")
#'evil-mc-make-cursor-in-visual-selection-end)
+
+ (define-key evil-mc-cursors-map (kbd "o")
#'evil-mc-make-cursor-move-next-line)
+ (define-key evil-mc-cursors-map (kbd "O")
#'evil-mc-make-cursor-move-prev-line)
+
+ (define-key evil-mc-cursors-map (kbd "n") #'evil-mc-make-and-goto-next-match)
+ (define-key evil-mc-cursors-map (kbd "N") #'evil-mc-make-and-goto-prev-match)
+ (define-key evil-mc-cursors-map (kbd "C-n")
#'evil-mc-skip-and-goto-next-match)
+ (define-key evil-mc-cursors-map (kbd "C-S-n")
#'evil-mc-skip-and-goto-prev-match)
+ (define-key evil-mc-cursors-map (kbd "M-n")
#'evil-mc-make-and-goto-next-cursor)
+ (define-key evil-mc-cursors-map (kbd "M-N")
#'evil-mc-make-and-goto-prev-cursor)
+ (define-key evil-mc-cursors-map (kbd "C-u")
#'evil-mc-skip-and-goto-next-cursor)
+ (define-key evil-mc-cursors-map (kbd "C-S-u")
#'evil-mc-skip-and-goto-prev-cursor)
(setcdr evil-mc-key-map nil)
(evil-collection-define-key '(normal visual) 'evil-mc-key-map (kbd "g.")
evil-mc-cursors-map)
diff --git a/modes/geiser/evil-collection-geiser.el
b/modes/geiser/evil-collection-geiser.el
index a875b4216d..df67404ae0 100644
--- a/modes/geiser/evil-collection-geiser.el
+++ b/modes/geiser/evil-collection-geiser.el
@@ -51,8 +51,8 @@
(defun evil-collection-geiser-setup ()
"Set up bindings for `geiser'."
(unless evil-move-beyond-eol
- (advice-add 'geiser-eval-last-sexp :around
'evil-collection-geiser-last-sexp)
- (advice-add 'geiser-eval-last-sexp-and-print :around
'evil-collection-geiser-last-sexp))
+ (advice-add 'geiser-eval-last-sexp :around
#'evil-collection-geiser-last-sexp)
+ (advice-add 'geiser-eval-last-sexp-and-print :around
#'evil-collection-geiser-last-sexp))
(evil-set-initial-state 'geiser-debug-mode 'normal)
(evil-set-initial-state 'geiser-doc-mode 'normal)
diff --git a/modes/helm/evil-collection-helm.el
b/modes/helm/evil-collection-helm.el
index 1a252cac8b..cefafe3052 100644
--- a/modes/helm/evil-collection-helm.el
+++ b/modes/helm/evil-collection-helm.el
@@ -108,8 +108,8 @@
;;;###autoload
(defun evil-collection-helm-setup ()
"Set up `evil' bindings for `helm'."
- (add-hook 'helm-minibuffer-set-up-hook
'evil-collection-helm-hide-minibuffer-maybe)
- (setq helm-default-prompt-display-function
'evil-collection-helm--set-prompt-display)
+ (add-hook 'helm-minibuffer-set-up-hook
#'evil-collection-helm-hide-minibuffer-maybe)
+ (setq helm-default-prompt-display-function
#'evil-collection-helm--set-prompt-display)
(custom-set-variables
'(helm-minibuffer-history-key "M-p"))
diff --git a/modes/lispy/evil-collection-lispy.el
b/modes/lispy/evil-collection-lispy.el
index 7ff032396a..ca50c6dd2d 100644
--- a/modes/lispy/evil-collection-lispy.el
+++ b/modes/lispy/evil-collection-lispy.el
@@ -605,7 +605,7 @@ This is an exact copy of `lispy-set-key-theme' except with
the additions of
;;;###autoload
(defun evil-collection-lispy-setup ()
"Set up `evil' bindings for `lispy'."
- (advice-add 'lispy-set-key-theme :override
'evil-collection-lispy-set-key-theme)
+ (advice-add 'lispy-set-key-theme :override
#'evil-collection-lispy-set-key-theme)
(lispy-set-key-theme '(special-evil evil))
(evil-collection-define-key 'normal 'evil-collection-lispy-mode-map
;; Instead of inheriting, explicitly define keys from
`lispy-mode-map-base'.
diff --git a/modes/lms/evil-collection-lms.el b/modes/lms/evil-collection-lms.el
index 754511926c..f3647b122a 100644
--- a/modes/lms/evil-collection-lms.el
+++ b/modes/lms/evil-collection-lms.el
@@ -80,7 +80,7 @@
(lms-ui-playing-now-refresh))
(defalias 'evil-collection-lms-ui-year-album-artist-list-mode-quit
- 'evil-collection-lms-ui-tracks-list-mode-quit
+ #'evil-collection-lms-ui-tracks-list-mode-quit
"Exit lms-ui-tracks-list-mode.")
(defun evil-collection-lms-goto-line (count)
@@ -407,7 +407,7 @@ The actions triggered by pressing keys refer to the track
under cursor.
'action 'lms-ui-yaal-by-album)
;; Reflect help keybinding changes in the lms.el UI.
- (advice-add 'lms-ui-playing-now :after 'evil-collection-lms-ui-playing-now)
+ (advice-add 'lms-ui-playing-now :after #'evil-collection-lms-ui-playing-now)
(setq lms-ui-docs evil-collection-lms-ui-docs))
(provide 'evil-collection-lms)
diff --git a/modes/magit-repos/evil-collection-magit-repos.el
b/modes/magit-repos/evil-collection-magit-repos.el
index 1c57ec9f35..df43b26ab0 100644
--- a/modes/magit-repos/evil-collection-magit-repos.el
+++ b/modes/magit-repos/evil-collection-magit-repos.el
@@ -44,7 +44,7 @@
'unmark 'magit-repolist-unmark
'action 'magit-repolist-status
'refresh 'magit-list-repositories)
- (add-hook 'magit-repolist-mode-hook 'evil-normalize-keymaps))
+ (add-hook 'magit-repolist-mode-hook #'evil-normalize-keymaps))
(provide 'evil-collection-magit-repos)
;;; evil-collection-magit-repos.el ends here
diff --git a/modes/magit-todos/evil-collection-magit-todos.el
b/modes/magit-todos/evil-collection-magit-todos.el
index 31465392c2..1f01d4d75a 100644
--- a/modes/magit-todos/evil-collection-magit-todos.el
+++ b/modes/magit-todos/evil-collection-magit-todos.el
@@ -53,9 +53,9 @@
(evil-collection-define-key nil 'magit-todos-item-section-map key nil))
;; No need to tell me that jT isn't bound
- (advice-add 'magit-todos-mode :around
'evil-collection-magit-todos-supress-warning)
+ (advice-add 'magit-todos-mode :around
#'evil-collection-magit-todos-supress-warning)
- (add-hook 'magit-todos-mode-hook
'evil-collection-magit-todos-setup-jump-key))
+ (add-hook 'magit-todos-mode-hook
#'evil-collection-magit-todos-setup-jump-key))
(provide 'evil-collection-magit-todos)
diff --git a/modes/magit/evil-collection-magit.el
b/modes/magit/evil-collection-magit.el
index 1139e7ece2..4dc35b00ac 100644
--- a/modes/magit/evil-collection-magit.el
+++ b/modes/magit/evil-collection-magit.el
@@ -129,8 +129,8 @@ Move `magit-diff-default-context' to \"~\"."
;; and introduces possible bugs
(defun evil-collection-magit-remove-visual-activate-hook ()
(when (derived-mode-p 'magit-mode)
- (remove-hook 'activate-mark-hook 'evil-visual-activate-hook t)))
-(add-hook 'evil-local-mode-hook
'evil-collection-magit-remove-visual-activate-hook)
+ (remove-hook 'activate-mark-hook #'evil-visual-activate-hook t)))
+(add-hook 'evil-local-mode-hook
#'evil-collection-magit-remove-visual-activate-hook)
(defun evil-collection-magit-maybe-deactivate-mark ()
"Deactivate mark if region is active. Used for ESC binding."
@@ -490,15 +490,15 @@ denotes the original magit key for this command.")
`(evil-make-overriding-map magit-gh-pulls-mode-map
',evil-collection-magit-state))
;; Need to refresh evil keymaps when blame/blob mode is entered.
-(add-hook 'magit-blame-mode-hook 'evil-normalize-keymaps)
-(add-hook 'magit-blob-mode-hook 'evil-normalize-keymaps)
+(add-hook 'magit-blame-mode-hook #'evil-normalize-keymaps)
+(add-hook 'magit-blob-mode-hook #'evil-normalize-keymaps)
(evil-set-initial-state 'magit-submodule-list-mode 'normal)
(evil-collection-define-key 'normal 'magit-submodule-list-mode-map
(kbd "RET") 'magit-repolist-status
(kbd "gr") 'magit-list-submodules)
-(add-hook 'magit-submodule-list-mode-hook 'evil-normalize-keymaps)
+(add-hook 'magit-submodule-list-mode-hook #'evil-normalize-keymaps)
(eval-after-load 'git-rebase
@@ -558,8 +558,8 @@ denotes the original magit key for this command.")
(substitute-command-keys
(format "\\[%s]" (nth 1 cmd)))))
(nth 2 cmd)))))))))
- (remove-hook 'git-rebase-mode-hook 'git-rebase-mode-show-keybindings)
- (add-hook 'git-rebase-mode-hook
'evil-collection-magit-add-rebase-messages t)))
+ (remove-hook 'git-rebase-mode-hook #'git-rebase-mode-show-keybindings)
+ (add-hook 'git-rebase-mode-hook
#'evil-collection-magit-add-rebase-messages t)))
;; section maps: evil's auxiliary maps don't work here, because these maps are
;; text overlays
@@ -591,7 +591,7 @@ evil-collection-magit affects.")
(defun evil-collection-magit-adjust-section-bindings ()
"Adjust bindings in section maps for evil-collection-magit."
(define-key magit-file-section-map "I"
- 'evil-collection-magit-stage-untracked-file-with-intent)
+ #'evil-collection-magit-stage-untracked-file-with-intent)
(define-key magit-file-section-map "\C-j" nil) ; breaking change
(define-key magit-hunk-section-map "\C-j" nil) ; breaking change
(let ((return-cmd (if evil-collection-magit-visit-worktree-file-on-return
@@ -608,10 +608,10 @@ evil-collection-magit affects.")
(defun evil-collection-magit-revert-section-bindings ()
"Revert changed bindings in section maps generated by evil-collection-magit."
(define-key magit-file-section-map "I" nil)
- (define-key magit-file-section-map "\C-j" 'magit-diff-visit-file-worktree)
- (define-key magit-hunk-section-map "\C-j" 'magit-diff-visit-file-worktree)
- (define-key magit-file-section-map (kbd "RET") 'magit-diff-visit-file)
- (define-key magit-hunk-section-map (kbd "RET") 'magit-diff-visit-file)
+ (define-key magit-file-section-map "\C-j" #'magit-diff-visit-file-worktree)
+ (define-key magit-hunk-section-map "\C-j" #'magit-diff-visit-file-worktree)
+ (define-key magit-file-section-map (kbd "RET") #'magit-diff-visit-file)
+ (define-key magit-hunk-section-map (kbd "RET") #'magit-diff-visit-file)
(define-key magit-file-section-map (kbd "S-<return>") nil)
(define-key magit-hunk-section-map (kbd "S-<return>") nil))
diff --git a/modes/minibuffer/evil-collection-minibuffer.el
b/modes/minibuffer/evil-collection-minibuffer.el
index e8c0416a36..c057fcdde6 100644
--- a/modes/minibuffer/evil-collection-minibuffer.el
+++ b/modes/minibuffer/evil-collection-minibuffer.el
@@ -73,7 +73,7 @@ it does not have a mode."
(evil-collection-define-key 'normal map (kbd "<escape>")
'abort-recursive-edit)
(evil-collection-bind map 'action 'exit-minibuffer))
- (add-hook 'minibuffer-setup-hook 'evil-collection-minibuffer-insert)
+ (add-hook 'minibuffer-setup-hook #'evil-collection-minibuffer-insert)
;; Because of the above minibuffer-setup-hook, some evil-ex bindings need be
reset.
(evil-collection-define-key 'normal 'evil-ex-completion-map (kbd "<escape>")
'abort-recursive-edit)
(evil-collection-define-key 'insert 'evil-ex-completion-map (kbd "C-p")
'previous-complete-history-element)
diff --git a/modes/monky/evil-collection-monky.el
b/modes/monky/evil-collection-monky.el
index 072bec3566..efe66febdd 100644
--- a/modes/monky/evil-collection-monky.el
+++ b/modes/monky/evil-collection-monky.el
@@ -43,8 +43,8 @@
(defun evil-collection-monky-setup ()
"Set up `evil' bindings for `monky'."
(evil-set-initial-state 'monky-mode 'normal)
- (add-hook 'monky-mode-hook 'evil-normalize-keymaps)
- (add-hook 'monky-status-mode-hook 'evil-normalize-keymaps)
+ (add-hook 'monky-mode-hook #'evil-normalize-keymaps)
+ (add-hook 'monky-status-mode-hook #'evil-normalize-keymaps)
(evil-collection-define-key 'normal 'monky-mode-map
(kbd "SPC") 'monky-show-item-or-scroll-up
diff --git a/modes/mu4e-conversation/evil-collection-mu4e-conversation.el
b/modes/mu4e-conversation/evil-collection-mu4e-conversation.el
index 1b4747921a..eb8cd71d16 100644
--- a/modes/mu4e-conversation/evil-collection-mu4e-conversation.el
+++ b/modes/mu4e-conversation/evil-collection-mu4e-conversation.el
@@ -51,7 +51,7 @@
(defun evil-collection-mu4e-conversation--update-local-map ()
(setq evil-collection-mu4e-conversation--local-map-p (get-text-property
(point) 'local-map))
(evil-normalize-keymaps)
- (add-hook 'post-command-hook 'evil-collection-mu4e-conversation--switch nil
t))
+ (add-hook 'post-command-hook #'evil-collection-mu4e-conversation--switch nil
t))
;;;###autoload
(defun evil-collection-mu4e-conversation-setup ()
@@ -61,7 +61,7 @@
;; https://github.com/emacs-evil/evil/issues/301. Thus we force the update
;; with a technique similar to what `org~mu4e-mime-switch-headers-or-body'
;; does.
- (add-hook 'mu4e-conversation-hook
'evil-collection-mu4e-conversation--update-local-map)
+ (add-hook 'mu4e-conversation-hook
#'evil-collection-mu4e-conversation--update-local-map)
(evil-collection-define-key 'normal 'mu4e-conversation-map
" " 'evil-scroll-page-down
(kbd "S-SPC") 'evil-scroll-page-up
diff --git a/modes/mu4e/evil-collection-mu4e-1.8.el
b/modes/mu4e/evil-collection-mu4e-1.8.el
index 0d34a6c2f8..de34321cb0 100644
--- a/modes/mu4e/evil-collection-mu4e-1.8.el
+++ b/modes/mu4e/evil-collection-mu4e-1.8.el
@@ -185,7 +185,7 @@ with older release versions of `mu4e.'"
"zd" mu4e-headers-toggle-skip-duplicates
"gl" mu4e-show-log
"gv" mu4e-select-other-view
- "T" (lambda ()
+ "T" ,(lambda ()
(interactive)
(mu4e-headers-mark-thread nil '(read))))
@@ -236,7 +236,7 @@ with older release versions of `mu4e.'"
"." mu4e-view-raw-message
,(kbd "C--") mu4e-headers-split-view-shrink
,(kbd "C-+") mu4e-headers-split-view-grow
- "T" (lambda ()
+ "T" ,(lambda ()
(interactive)
(mu4e-headers-mark-thread nil '(read)))
,@(when evil-want-C-u-scroll
@@ -436,7 +436,7 @@ is already done earlier."
(evil-collection-mu4e-set-state)
(evil-collection-mu4e-set-bindings)
(evil-collection-bind 'mu4e-headers-mode-map 'jump
'mu4e~headers-jump-to-maildir)
- (add-hook 'mu4e-main-mode-hook 'evil-collection-mu4e-update-main-view)
+ (add-hook 'mu4e-main-mode-hook #'evil-collection-mu4e-update-main-view)
(add-hook 'org-mode-hook
#'evil-collection-mu4e-org-set-header-to-normal-mode)
(add-hook 'mu4e-compose-pre-hook
#'evil-collection-mu4e-org-set-header-to-insert-mode))
diff --git a/modes/p-search/evil-collection-p-search.el
b/modes/p-search/evil-collection-p-search.el
index 59a11138f8..356caedfc4 100644
--- a/modes/p-search/evil-collection-p-search.el
+++ b/modes/p-search/evil-collection-p-search.el
@@ -45,7 +45,7 @@
(defun evil-collection-p-search-setup ()
"Set up `evil' bindings for p-search."
- (add-hook 'p-search-mode-hook 'evil-collection-p-search-mode)
+ (add-hook 'p-search-mode-hook #'evil-collection-p-search-mode)
(evil-collection-define-key 'normal 'evil-collection-p-search-mode-map
"a" 'p-search-add-dwim
diff --git a/modes/pass/evil-collection-pass.el
b/modes/pass/evil-collection-pass.el
index 9057d58138..9df295235f 100644
--- a/modes/pass/evil-collection-pass.el
+++ b/modes/pass/evil-collection-pass.el
@@ -70,7 +70,7 @@ keybindings listed in
`evil-collection-pass-command-to-label'."
(evil-collection-bind 'pass-mode-map 'edit 'pass-edit))
(advice-add 'pass--display-keybinding
- :around 'evil-collection-pass-display-keybinding)
+ :around #'evil-collection-pass-display-keybinding)
(evil-collection-define-operator-key 'yank 'pass-mode-map
"f" 'pass-copy-field
diff --git a/modes/pdf/evil-collection-pdf.el b/modes/pdf/evil-collection-pdf.el
index 0d741629ea..52426bc4fb 100644
--- a/modes/pdf/evil-collection-pdf.el
+++ b/modes/pdf/evil-collection-pdf.el
@@ -106,7 +106,7 @@ instead, which is useless and counterintuitive."
(add-hook 'evil-local-mode-hook
(lambda () (remove-hook
'activate-mark-hook
- 'evil-visual-activate-hook
+ #'evil-visual-activate-hook
t))
nil t))
diff --git a/modes/scroll-lock/evil-collection-scroll-lock.el
b/modes/scroll-lock/evil-collection-scroll-lock.el
index 6b1e9ccf7a..71e580bff8 100644
--- a/modes/scroll-lock/evil-collection-scroll-lock.el
+++ b/modes/scroll-lock/evil-collection-scroll-lock.el
@@ -81,7 +81,7 @@
(evil-add-command-properties
#'evil-collection-scroll-lock-backward-paragraph :jump t)
- (add-hook 'scroll-lock-mode-hook 'evil-normalize-keymaps))
+ (add-hook 'scroll-lock-mode-hook #'evil-normalize-keymaps))
(provide 'evil-collection-scroll-lock)
;;; evil-collection-scroll-lock.el ends here
diff --git a/modes/simple-mpc/evil-collection-simple-mpc.el
b/modes/simple-mpc/evil-collection-simple-mpc.el
index eed10672f7..113365d089 100644
--- a/modes/simple-mpc/evil-collection-simple-mpc.el
+++ b/modes/simple-mpc/evil-collection-simple-mpc.el
@@ -108,9 +108,9 @@ Other modes that are configured:
(defun evil-collection-simple-mpc-setup ()
"Set up simple-mpc bindings and main view."
(evil-collection-simple-mpc-set-bindings)
- (add-hook 'simple-mpc-mode-hook
'evil-collection-simple-mpc-replace-main-view)
- (add-hook 'simple-mpc-query-mode-hook 'evil-normalize-keymaps)
- (add-hook 'simple-mpc-current-playlist-mode-hook 'evil-normalize-keymaps))
+ (add-hook 'simple-mpc-mode-hook
#'evil-collection-simple-mpc-replace-main-view)
+ (add-hook 'simple-mpc-query-mode-hook #'evil-normalize-keymaps)
+ (add-hook 'simple-mpc-current-playlist-mode-hook #'evil-normalize-keymaps))
(provide 'evil-collection-simple-mpc)
;;; evil-collection-simple-mpc.el ends here
diff --git a/modes/slime/evil-collection-slime.el
b/modes/slime/evil-collection-slime.el
index d821b2e916..92820891a3 100644
--- a/modes/slime/evil-collection-slime.el
+++ b/modes/slime/evil-collection-slime.el
@@ -59,11 +59,11 @@
(defun evil-collection-slime-setup ()
"Set up `evil' bindings for `slime'."
(unless evil-move-beyond-eol
- (advice-add 'slime-eval-last-expression :around
'evil-collection-slime-last-sexp)
- (advice-add 'slime-pprint-eval-last-expression :around
'evil-collection-slime-last-sexp)
- (advice-add 'slime-eval-print-last-expression :around
'evil-collection-slime-last-sexp)
+ (advice-add 'slime-eval-last-expression :around
#'evil-collection-slime-last-sexp)
+ (advice-add 'slime-pprint-eval-last-expression :around
#'evil-collection-slime-last-sexp)
+ (advice-add 'slime-eval-print-last-expression :around
#'evil-collection-slime-last-sexp)
(advice-add 'slime-eval-last-expression-in-repl
- :around 'evil-collection-slime-last-sexp))
+ :around #'evil-collection-slime-last-sexp))
(evil-set-initial-state 'sldb-mode 'normal)
(evil-set-initial-state 'slime-inspector-mode 'normal)
diff --git a/modes/sly/evil-collection-sly.el b/modes/sly/evil-collection-sly.el
index 9ff1dc1d64..363c6182b3 100644
--- a/modes/sly/evil-collection-sly.el
+++ b/modes/sly/evil-collection-sly.el
@@ -84,10 +84,10 @@ Evil version of `sly-eval-print-last-expression' that
accounts for
(defun evil-collection-sly-setup ()
"Set up `evil' bindings for `sly'."
(unless evil-move-beyond-eol
- (advice-add 'sly-eval-last-expression :around
'evil-collection-sly-last-sexp)
- (advice-add 'sly-pprint-eval-last-expression :around
'evil-collection-sly-last-sexp)
- (advice-add 'sly-mrepl-return :around 'evil-collection-sly-last-sexp)
- (advice-add 'sly-eval-print-last-expression :override
'evil-collection-sly-eval-print-last-expression))
+ (advice-add 'sly-eval-last-expression :around
#'evil-collection-sly-last-sexp)
+ (advice-add 'sly-pprint-eval-last-expression :around
#'evil-collection-sly-last-sexp)
+ (advice-add 'sly-mrepl-return :around #'evil-collection-sly-last-sexp)
+ (advice-add 'sly-eval-print-last-expression :override
#'evil-collection-sly-eval-print-last-expression))
(evil-collection-define-key 'normal 'sly-db-mode-map
[follow-link] 'mouse-face
diff --git a/modes/term/evil-collection-term.el
b/modes/term/evil-collection-term.el
index 8f89ac130f..ced7e264f1 100644
--- a/modes/term/evil-collection-term.el
+++ b/modes/term/evil-collection-term.el
@@ -96,7 +96,7 @@ it is not appropriate in some cases like terminals."
"Sync `term-char-mode' and `term-line-mode' with insert and normal state."
(add-hook 'evil-insert-state-entry-hook
evil-collection-term-sync-state-function nil t)
- (add-hook 'evil-insert-state-exit-hook 'term-line-mode nil t))
+ (add-hook 'evil-insert-state-exit-hook #'term-line-mode nil t))
(defun evil-collection-term-send-tab ()
"Send tab in term mode."
@@ -108,10 +108,10 @@ it is not appropriate in some cases like terminals."
"Set up `evil' bindings for `term'."
(evil-set-initial-state 'term-mode 'insert)
(if evil-collection-term-sync-state-and-mode-p
- (add-hook 'term-mode-hook 'evil-collection-term-sync-state-and-mode)
- (remove-hook 'term-mode-hook 'evil-collection-term-sync-state-and-mode))
+ (add-hook 'term-mode-hook #'evil-collection-term-sync-state-and-mode)
+ (remove-hook 'term-mode-hook #'evil-collection-term-sync-state-and-mode))
- (add-hook 'term-mode-hook 'evil-collection-term-escape-stay)
+ (add-hook 'term-mode-hook #'evil-collection-term-escape-stay)
;; Evil has some "C-" bindings in insert state that shadow regular terminal
;; bindings. Don't raw-send "C-c" (prefix key) nor "C-h" (help prefix).
diff --git a/modes/unimpaired/evil-collection-unimpaired.el
b/modes/unimpaired/evil-collection-unimpaired.el
index 01fcf0da22..3b51ebeb65 100644
--- a/modes/unimpaired/evil-collection-unimpaired.el
+++ b/modes/unimpaired/evil-collection-unimpaired.el
@@ -54,8 +54,7 @@
;;;###autoload
(define-globalized-minor-mode global-evil-collection-unimpaired-mode
- evil-collection-unimpaired-mode evil-collection-unimpaired-mode-on
- :group 'evil-collection-unimpaired)
+ evil-collection-unimpaired-mode evil-collection-unimpaired-mode-on)
(defun evil-collection-unimpaired-mode-on ()
"Turn on `evil-collection-unimpaired-mode'."
@@ -82,7 +81,7 @@
(defun evil-collection-unimpaired--flycheck-count-errors ()
"Count the number of flycheck errors."
- (length (delete-dups (mapcar 'flycheck-error-line flycheck-current-errors))))
+ (length (delete-dups (mapcar #'flycheck-error-line
flycheck-current-errors))))
(evil-define-motion evil-collection-unimpaired-first-error ()
"Go to the first error."
diff --git a/modes/vdiff/evil-collection-vdiff.el
b/modes/vdiff/evil-collection-vdiff.el
index 3924d82b96..8d290ea939 100644
--- a/modes/vdiff/evil-collection-vdiff.el
+++ b/modes/vdiff/evil-collection-vdiff.el
@@ -36,8 +36,8 @@
;;;###autoload
(defun evil-collection-vdiff-setup ()
"Set up `evil' bindings for `vdiff-mode'."
- (add-hook 'vdiff-mode-hook 'evil-normalize-keymaps)
- (add-hook 'vdiff-3way-mode-hook 'evil-normalize-keymaps)
+ (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
diff --git a/modes/view/evil-collection-view.el
b/modes/view/evil-collection-view.el
index e65e5919d0..31979aa624 100644
--- a/modes/view/evil-collection-view.el
+++ b/modes/view/evil-collection-view.el
@@ -35,7 +35,7 @@
;;;###autoload
(defun evil-collection-view-setup ()
"Set up `evil' bindings for `view'."
- (add-hook 'view-mode-hook 'evil-normalize-keymaps)
+ (add-hook 'view-mode-hook #'evil-normalize-keymaps)
(evil-set-initial-state 'view-mode 'normal)
(evil-collection-define-key 'normal 'view-mode-map
;; refresh
diff --git a/test/evil-collection-magit-tests.el
b/test/evil-collection-magit-tests.el
index 9b4c892efe..69665822af 100644
--- a/test/evil-collection-magit-tests.el
+++ b/test/evil-collection-magit-tests.el
@@ -1,4 +1,4 @@
-;;; evil-collection-magit-tests.el --- evil-based key bindings for magit
+;;; evil-collection-magit-tests.el --- evil-based key bindings for magit -*-
lexical-binding: t; -*-
;; Copyright (C) 2015-2016 Justin Burkett
@@ -89,8 +89,7 @@ we can find."
(ert-deftest evil-collection-magit-all-modes-accounted-for ()
"Check that mode lists include all modes we can find."
- (let ((modes (evil-collection-magit-collect-git-magit-modes))
- res)
+ (let ((modes (evil-collection-magit-collect-git-magit-modes)))
(dolist (mode modes)
(when (boundp mode)
(should (memq mode
diff --git a/test/evil-collection-test.el b/test/evil-collection-test.el
index d2c174f35a..f7eec92528 100644
--- a/test/evil-collection-test.el
+++ b/test/evil-collection-test.el
@@ -299,7 +299,7 @@
"Symbols with function bindings (e.g. `insert') are data, not funcalled.
This guards against the trap where `:state insert' would otherwise be
funcalled because `(functionp \\='insert)' returns t."
- (cl-assert (functionp 'insert) nil
+ (cl-assert (fboundp 'insert) nil
"Test premise: `insert' must be function-bound.")
(let ((evil-collection-binding-defaults '((demo :state insert)))
(evil-collection-binding-overrides nil))
diff --git a/test/test-helper.el b/test/test-helper.el
index b5d9e63200..70c1e5a183 100644
--- a/test/test-helper.el
+++ b/test/test-helper.el
@@ -2,7 +2,7 @@
(require 'ert)
;; FIXME: Adding `f' as a dependency just for this line.
-(require 'f)
+(require 'f nil t)
(let ((evil-collection-dir (f-parent (f-dirname (f-this-file)))))
(add-to-list 'load-path evil-collection-dir))
(require 'evil-collection)
