Move stuff around

init.el

@@ -1541,15 +1541,13 @@ specific to most general, they are these:
   (:option flyspell-correct-interface #'flyspell-correct-completing-read
            flyspell-correct--cr-key ";")
 
-  (defun acdw/flyspell-correct-f7 ()
-    "Run a full spell correction on the current buffer."
-    (interactive)
-    (save-mark-and-excursion
-      (flyspell-correct-move 0 :forward :rapid)))
-
   (:with-feature flyspell
     (:bind "C-." #'flyspell-correct-wrapper
-           "<f7>" #'acdw/flyspell-correct-f7)
+           "<f7>" (defun acdw/flyspell-correct-f7 ()
+                    "Run a full spell correction on the current buffer."
+                    (interactive)
+                    (save-mark-and-excursion
+                      (flyspell-correct-move 0 :forward :rapid))))
     (:unbind "C-;" "C-," "C-." "C-M-i")))
 
 (setup (:straight-if forge
@@ -1602,11 +1600,9 @@ specific to most general, they are these:
   (with-eval-after-load 'elpher
     (require 'gemini-write)))
 
-(setup (:straight gitattributes-mode))
-
-(setup (:straight gitconfig-mode))
-
-(setup (:straight gitignore-mode))
+(setup (:straight gitattributes-mode
+                  gitconfig-mode
+                  gitignore-mode))
 
 (setup (:straight helpful)
   (:require-after 3)
@@ -1981,8 +1977,10 @@ browser defined in `browse-url-secondary-browser-function'."
                          (if transform
                              (substring
                               cand
-                              (next-single-property-change 0 'consult-org--buffer cand))
-                           (let ((m (car (get-text-property 0 'consult-org--heading cand))))
+                              (next-single-property-change
+                               0 'consult-org--buffer cand))
+                           (let ((m (car (get-text-property
+                                          0 'consult-org--heading cand))))
                              (if (member m org-clock-history)
                                  "*Recent*"
                                (buffer-name (marker-buffer m))))))))
@@ -2011,11 +2009,12 @@ the default is \"/\"."
 		              (lambda (s) (replace-regexp-in-string "[ \t]+\\'" "" s))
 		              (cl-loop for head in path
 			                   for n from 0
-			                   collect (el-patch-swap
-                                         (org-add-props
-				                             head nil 'face
-				                             (nth (% n org-n-level-faces) org-level-faces))
-                                         head))
+			                   collect
+                               (el-patch-swap
+                                 (org-add-props
+                                  head nil 'face
+				                  (nth (% n org-n-level-faces) org-level-faces))
+                                 head))
 		              separator))))
         (when (> (length fpath) width)
           (if (< width 7)
@@ -2100,9 +2099,11 @@ the default is \"/\"."
     (when update-packages
       (require 'straight-x)
       (straight-x-pull-all))
-    (restart-emacs)))(setup (:straight (shell-command+
-                                        :host nil
-                                        :repo "https://git.sr.ht/~pkal/shell-command-plus"))
+    (restart-emacs)))
+
+(setup (:straight (shell-command+
+                   :host nil
+                   :repo "https://git.sr.ht/~pkal/shell-command-plus"))
   (:option shell-command-prompt "$ ")
   (:with-feature dired
     (:bind "M-!" shell-command+))
@@ -2381,5 +2382,3 @@ If used with a numeric prefix argument N, N backticks will be inserted."
              (if prefix
                  (call-interactively #'zzz-to-char)
                (call-interactively #'zzz-up-to-char)))))
-
-;;; init.el ends here