Updating dotfiles.

.emacs.d/modules/editor/evil/autoload/advice.el

@@ -176,6 +176,29 @@ more information on modifiers."
     (balance-windows (window-parent)))
   (if file (evil-edit file)))
 
+;;;###autoload (autoload '+evil-join-a "editor/evil/autoload/advice" nil nil)
+(evil-define-operator +evil-join-a (beg end)
+  "Join the selected lines.
+
+This advice improves on `evil-join' by removing comment delimiters when joining
+commented lines, by using `fill-region-as-paragraph'.
+
+From https://github.com/emacs-evil/evil/issues/606"
+  :motion evil-line
+  (let* ((count (count-lines beg end))
+         (count (if (> count 1) (1- count) count))
+         (fixup-mark (make-marker)))
+    (dotimes (var count)
+      (if (and (bolp) (eolp))
+          (join-line 1)
+        (let* ((end (line-beginning-position 3))
+               (fill-column (1+ (- end beg))))
+          (set-marker fixup-mark (line-end-position))
+          (fill-region-as-paragraph beg end nil t)
+          (goto-char fixup-mark)
+          (fixup-whitespace))))
+    (set-marker fixup-mark nil)))
+
 ;;;###autoload
 (defun +evil--fix-dabbrev-in-minibuffer-h ()
   "Make `try-expand-dabbrev' from `hippie-expand' work in minibuffer. See

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

@@ -155,6 +155,17 @@ directives. By default, this only recognizes C directives.")
       (run-at-time 0.1 nil #'helpful-key key-sequence)
       (abort-recursive-edit)))
 
+  ;; Make J (evil-join) remove comment delimiters when joining lines.
+  (advice-add #'evil-join :override #'+evil-join-a)
+
+  ;; Prevent gw (`evil-fill') and gq (`evil-fill-and-move') from squeezing
+  ;; spaces. It doesn't in vim, so it shouldn't in evil.
+  (defadvice! +evil--no-squeeze-on-fill-a (orig-fn &rest args)
+    :around '(evil-fill evil-fill-and-move)
+    (letf! (defun fill-region (from to &optional justify nosqueeze to-eop)
+             (funcall fill-region from to justify t to-eop))
+      (apply orig-fn args)))
+
   ;; Make ESC (from normal mode) the universal escaper. See `doom-escape-hook'.
   (advice-add #'evil-force-normal-state :after #'+evil-escape-a)
 
@@ -373,16 +384,18 @@ directives. By default, this only recognizes C directives.")
 ;;; Keybinds
 
 ;; 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
 ;;   zu{q,w} - undo last marking
-;; Keybinds that evil define:
-;;   z= - correct flyspell word at point
-;;   ]s - jump to previous spelling error
-;;   [s - jump to next spelling error
 
 (map! :v  "@"     #'+evil:apply-macro
 
+      ;; implement dictionary keybinds
+      ;; evil already defines 'z=' to `ispell-word' = correct word at point
+      (:when (featurep! :checkers spell)
+       :n  "zq"   #'+spell/add-word
+       :n  "zw"   #'+spell/remove-word
+       :m  "[s"   #'+spell/previous-error
+       :m  "]s"   #'+spell/next-error)
+
       ;; ported from vim-unimpaired
       :n  "] SPC" #'+evil/insert-newline-below
       :n  "[ SPC" #'+evil/insert-newline-above

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

@@ -1,7 +1,7 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; editor/evil/packages.el
 
-(package! evil :pin "2bc6ca3587502fde67b93e411e329fc8224c916a")
+(package! evil :pin "1e7aa5bfbd86feff0ed5982e487070352d326b90")
 (package! evil-args :pin "758ad5ae54ad34202064fec192c88151c08cb387")
 (package! evil-easymotion :pin "f96c2ed38ddc07908db7c3c11bcd6285a3e8c2e9")
 (package! evil-embrace :pin "4379adea032b25e359d01a36301b4a5afdd0d1b7")
@@ -33,4 +33,4 @@
     (package! neotree)
     (autoload 'neotree-make-executor "neotree" nil nil 'macro))
 
-  (package! evil-collection :pin "3e62b6b1312f7907081be41a032aaacffa732fef"))
+  (package! evil-collection :pin "c136589d9584e5d01a4b3f2e4cf8ac5f5a23be63"))

.emacs.d/modules/editor/file-templates/packages.el

@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; editor/file-templates/packages.el
 
-(package! yasnippet :pin "5b1217ab085fab4abeb1118dccb260691b446703")
+(package! yasnippet :pin "5cbdbf0d2015540c59ed8ee0fcf4788effdf75b6")

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

@@ -3,6 +3,6 @@
 
 (package! hideshow :built-in t)
 
-(package! vimish-fold :pin "63685239655a151181b9152e45478dad587f86f2")
+(package! vimish-fold :pin "9d12e39f01da517565666e09a2e32e01aed24a90")
 (when (featurep! :editor evil)
   (package! evil-vimish-fold :pin "b6e0e6b91b8cd047e80debef1a536d9d49eef31a"))

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

@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; editor/god/packages.el
 
-(package! god-mode :pin "1eb6ef3a4f67a805c5d6deb1e3895b6c853707d7")
+(package! god-mode :pin "ad2e6745294843462f78768b5a1cd3b0d3563951")

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

@@ -22,7 +22,7 @@
         '((operators normal)
           c-w
           (prettify insert)
-          (atom-movement normal visual)
+          (atom-movement t)
           slurp/barf-lispy
           additional
           additional-insert))

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

@@ -1,6 +1,6 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; editor/lispyville/packages.el
 
-(package! lispy :pin "cdaa9c70ca39a880163cbbce924bb46cc56b9fa4")
+(package! lispy :pin "0a9dcfdfbc20cadbb9cb29b224dc64b8efdd7b70")
 (when (featurep! :editor evil)
-  (package! lispyville :pin "25a70126ea807653e0a8c512d4128c90ed673d7a"))
+  (package! lispyville :pin "0f13f26cd6aa71f9fd852186ad4a00c4294661cd"))

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

@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; editor/objed/packages.el
 
-(package! objed :pin "e89d8dae3b2d4331a4455d2a7b203500537d184d")
+(package! objed :pin "dea5a64a4da32e8947fe5b45de569e293aaa8a96")

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

@@ -33,6 +33,8 @@
              #'yas-minor-mode-on)
 
   :config
+  (add-to-list 'doom-debug-variables '(yas-verbosity . 3))
+
   ;; Allow private snippets in DOOMDIR/snippets
   (add-to-list 'yas-snippet-dirs '+snippets-dir)
 

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

@@ -7,4 +7,4 @@
   :recipe (:host github
            :repo "hlissner/doom-snippets"
            :files ("*.el" "*"))
-  :pin "21b7c8d37224768091a34a6c3ede68d52d03fb18")
+  :pin "60c57d66d2afd1798bff5023a54ab155f311746a")

.emacs.d/modules/editor/word-wrap/packages.el

@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; editor/word-wrap/packages.el
 
-(package! adaptive-wrap :pin "1810c0ee8d827dd502ddeaae5bd759d4811fcbce")
+(package! adaptive-wrap :pin "319db649fb083db3ad07b4c71ee6c9429497043b")