Minor updates.

.emacs.d/modules/editor/evil/config.el

@@ -4,7 +4,9 @@
   "The keys to use for universal repeating motions.
 
 This is a cons cell whose CAR is the key for repeating a motion forward, and
-whose CDR is for repeating backward. They should both be `kbd'-able strings.")
+whose CDR is for repeating backward. They should both be `kbd'-able strings.
+
+Set this to `nil' to disable universal-repeating on these keys.")
 
 (defvar +evil-want-o/O-to-continue-comments t
   "If non-nil, the o/O keys will continue comment lines if the point is on a
@@ -32,7 +34,6 @@ directives. By default, this only recognizes C directives.")
   :preface
   (setq evil-want-visual-char-semi-exclusive t
         evil-ex-search-vim-style-regexp t
-        evil-ex-substitute-global t
         evil-ex-visual-char-range t  ; column range for ex commands
         evil-mode-line-format 'nil
         ;; more vim-like behavior
@@ -45,12 +46,15 @@ directives. By default, this only recognizes C directives.")
         evil-visual-state-cursor 'hollow
         ;; Only do highlighting in selected window so that Emacs has less work
         ;; to do highlighting them all.
-        evil-ex-interactive-search-highlight 'selected-window)
+        evil-ex-interactive-search-highlight 'selected-window
+        ;; It's infuriating that innocuous "beginning of line" or "end of line"
+        ;; errors will abort macros, so suppress them:
+        evil-kbd-macro-suppress-motion-error t)
 
   ;; Slow this down from 0.02 to prevent blocking in large or folded buffers
   ;; like magit while incrementally highlighting matches.
-  (setq-hook! 'magit-mode-hook evil-ex-hl-update-delay 0.2)
-  (setq-hook! 'so-long-minor-mode-hook evil-ex-hl-update-delay 0.25)
+  (setq-hook! '(magit-mode-hook so-long-minor-mode-hook)
+    evil-ex-hl-update-delay 0.25)
 
   :config
   (evil-select-search-module 'evil-search-module 'evil-search)
@@ -325,7 +329,7 @@ directives. By default, this only recognizes C directives.")
         evil-snipe-repeat-scope 'visible
         evil-snipe-char-fold t)
   :config
-  (pushnew! evil-snipe-disabled-modes 'Info-mode 'calc-mode)
+  (pushnew! evil-snipe-disabled-modes 'Info-mode 'calc-mode 'treemacs-mode)
   (evil-snipe-mode +1)
   (evil-snipe-override-mode +1))
 
@@ -368,42 +372,6 @@ directives. By default, this only recognizes C directives.")
 ;;
 ;;; Keybinds
 
-(defmacro set-repeater! (command next-func prev-func)
-  "Makes ; and , the universal repeat-keys in evil-mode.
-To change these keys see `+evil-repeat-keys'."
-  `(defadvice! ,(intern (format "+evil--repeat-%s-a" (doom-unquote command))) (&rest _)
-     :after-while #',command
-     (when +evil-repeat-keys
-       (evil-define-key* 'motion 'local
-         (kbd (car +evil-repeat-keys)) #',next-func
-         (kbd (cdr +evil-repeat-keys)) #',prev-func))))
-
-;; n/N
-(set-repeater! evil-ex-search-next evil-ex-search-next evil-ex-search-previous)
-(set-repeater! evil-ex-search-previous evil-ex-search-next evil-ex-search-previous)
-(set-repeater! evil-ex-search-forward evil-ex-search-next evil-ex-search-previous)
-(set-repeater! evil-ex-search-backward evil-ex-search-next evil-ex-search-previous)
-
-;; f/F/t/T/s/S
-(after! evil-snipe
-  (setq evil-snipe-repeat-keys nil
-        evil-snipe-override-evil-repeat-keys nil) ; causes problems with remapped ;
-  (set-repeater! evil-snipe-f evil-snipe-repeat evil-snipe-repeat-reverse)
-  (set-repeater! evil-snipe-F evil-snipe-repeat evil-snipe-repeat-reverse)
-  (set-repeater! evil-snipe-t evil-snipe-repeat evil-snipe-repeat-reverse)
-  (set-repeater! evil-snipe-T evil-snipe-repeat evil-snipe-repeat-reverse)
-  (set-repeater! evil-snipe-s evil-snipe-repeat evil-snipe-repeat-reverse)
-  (set-repeater! evil-snipe-S evil-snipe-repeat evil-snipe-repeat-reverse)
-  (set-repeater! evil-snipe-x evil-snipe-repeat evil-snipe-repeat-reverse)
-  (set-repeater! evil-snipe-X evil-snipe-repeat evil-snipe-repeat-reverse))
-
-;; */#
-(set-repeater! evil-visualstar/begin-search-forward
-               evil-ex-search-next evil-ex-search-previous)
-(set-repeater! evil-visualstar/begin-search-backward
-               evil-ex-search-previous evil-ex-search-next)
-
-
 ;; Keybinds that have no Emacs+evil analogues (i.e. don't exist):
 ;;   zq - mark word at point as good word
 ;;   zw - mark word at point as bad
@@ -501,7 +469,7 @@ To change these keys see `+evil-repeat-keys'."
       :nv "zn"    #'+evil:narrow-buffer
       :n  "zN"    #'doom/widen-indirectly-narrowed-buffer
       :n  "zx"    #'kill-current-buffer
-      :n  "ZX"    #'bury-buffer
+      :n  "ZX"    #'doom/save-and-kill-buffer
       ;; don't leave visual mode after shifting
       :v  "<"     #'+evil/visual-dedent  ; vnoremap < <gv
       :v  ">"     #'+evil/visual-indent  ; vnoremap > >gv
@@ -552,7 +520,7 @@ To change these keys see `+evil-repeat-keys'."
         "a" (evilem-create #'evil-forward-arg)
         "A" (evilem-create #'evil-backward-arg)
         "s" #'evil-avy-goto-char-2
-        "SPC" (cmd!! #'evil-avy-goto-char-timer t)
+        "SPC" (cmd! (let ((current-prefix-arg t)) (evil-avy-goto-char-timer)))
         "/" #'evil-avy-goto-char-timer))
 
       ;; evil-snipe

.emacs.d/modules/editor/evil/packages.el

@@ -1,7 +1,7 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; editor/evil/packages.el
 
-(package! evil :pin "25fc5c6647979357cf3e39f0667a9b7ae5266af9")
+(package! evil :pin "2bc6ca3587502fde67b93e411e329fc8224c916a")
 (package! evil-args :pin "758ad5ae54ad34202064fec192c88151c08cb387")
 (package! evil-easymotion :pin "f96c2ed38ddc07908db7c3c11bcd6285a3e8c2e9")
 (package! evil-embrace :pin "4379adea032b25e359d01a36301b4a5afdd0d1b7")
@@ -11,12 +11,12 @@
 (package! evil-exchange :pin "3030e21ee16a42dfce7f7cf86147b778b3f5d8c1")
 (package! evil-indent-plus :pin "0c7501e6efed661242c3a20e0a6c79a6455c2c40")
 (package! evil-lion :pin "6b03593f5dd6e7c9ca02207f9a73615cf94c93ab")
-(package! evil-nerd-commenter :pin "1bd2de52011c39777a3e8779b14cee2790dc873b")
+(package! evil-nerd-commenter :pin "87734b9c7fcd047f73a072b9d03ec05f786eeb03")
 (package! evil-numbers
   :recipe (:host github :repo "janpath/evil-numbers")
-  :pin "c2cfdd1eb1f193bea28ee79b191b78309677058a")
+  :pin "006da406d175c05fedca4431cccd569e20bef92c")
 (package! evil-snipe :pin "6dcac7f2516c6137a2de532fc2c052f242559ee3")
-(package! evil-surround :pin "1c34944d8c98da4a2385d24ee89eef9cdf569a12")
+(package! evil-surround :pin "346d4d85fcf1f9517e9c4991c1efe68b4130f93a")
 (package! evil-textobj-anyblock :pin "ff00980f0634f95bf2ad9956b615a155ea8743be")
 (package! evil-traces :pin "bc25cae9fa5ab0ba1507827f0944f52ce0ca7462")
 (package! evil-visualstar :pin "06c053d8f7381f91c53311b1234872ca96ced752")
@@ -33,4 +33,4 @@
     (package! neotree)
     (autoload 'neotree-make-executor "neotree" nil nil 'macro))
 
-  (package! evil-collection :pin "e065da3732f015428bd0068481dadad9e0e6d09c"))
+  (package! evil-collection :pin "3e62b6b1312f7907081be41a032aaacffa732fef"))