Conform many modules to new conventions

modules/editor/file-templates/config.el

@@ -114,7 +114,7 @@ information.")
   (or (file-in-directory-p file doom-private-dir)
       (file-in-directory-p file doom-emacs-dir)))
 
-(defun +file-templates|check ()
+(defun +file-templates-check-h ()
   "Check if the current buffer is a candidate for file template expansion. It
 must be non-read-only, empty, and there must be a rule in
 `+file-templates-alist' that applies to it."
@@ -143,4 +143,4 @@ must be non-read-only, empty, and there must be a rule in
     (yas-reload-all)))
 
 ;;
-(add-hook 'find-file-hook #'+file-templates|check)
+(add-hook 'find-file-hook #'+file-templates-check-h)

modules/editor/fold/autoload/hideshow.el

@@ -6,12 +6,12 @@
   :group 'doom-themes)
 
 ;;;###autoload
-(defun +fold-hideshow-haml-forward-sexp (arg)
+(defun +fold-hideshow-haml-forward-sexp-fn (arg)
   (haml-forward-sexp arg)
   (move-beginning-of-line 1))
 
 ;;;###autoload
-(defun +fold-hideshow-forward-block-by-indent (_arg)
+(defun +fold-hideshow-forward-block-by-indent-fn (_arg)
   (let ((start (current-indentation)))
     (forward-line)
     (unless (= start (current-indentation))
@@ -20,7 +20,7 @@
         (end-of-line)))))
 
 ;;;###autoload
-(defun +fold-hideshow-set-up-overlay (ov)
+(defun +fold-hideshow-set-up-overlay-fn (ov)
   (when (eq 'code (overlay-get ov 'hs))
     (when (featurep 'vimish-fold)
       (overlay-put

modules/editor/fold/config.el

@@ -18,13 +18,17 @@
 ;; Packages
 
 (def-package! hideshow ; built-in
-  :commands (hs-toggle-hiding hs-hide-block hs-hide-level hs-show-all hs-hide-all)
+  :commands (hs-toggle-hiding
+             hs-hide-block
+             hs-hide-level
+             hs-show-all
+             hs-hide-all)
   :config
   (setq hs-hide-comments-when-hiding-all nil
         ;; Nicer code-folding overlays (with fringe indicators)
-        hs-set-up-overlay #'+fold-hideshow-set-up-overlay)
+        hs-set-up-overlay #'+fold-hideshow-set-up-overlay-fn)
 
-  (def-advice! +fold-hideshow*ensure-mode (&rest _)
+  (def-advice! +fold-hideshow-ensure-mode-a (&rest _)
     "Ensure `hs-minor-mode' is enabled."
     :before '(hs-toggle-hiding hs-hide-block hs-hide-level hs-show-all hs-hide-all)
     (unless (bound-and-true-p hs-minor-mode)
@@ -38,8 +42,8 @@
              (yaml-mode "\\s-*\\_<\\(?:[^:]+\\)\\_>"
                         ""
                         "#"
-                        +fold-hideshow-forward-block-by-indent nil)
-             (haml-mode "[#.%]" "\n" "/" +fold-hideshow-haml-forward-sexp nil)
+                        +fold-hideshow-forward-block-by-indent-fn nil)
+             (haml-mode "[#.%]" "\n" "/" +fold-hideshow-haml-forward-sexp-fn nil)
              (ruby-mode "class\\|d\\(?:ef\\|o\\)\\|module\\|[[{]"
                         "end\\|[]}]"
                         "#\\|=begin"

modules/editor/format/autoload/format.el

@@ -98,7 +98,7 @@ Stolen shamelessly from go-mode"
     (if fmt (cons (intern fmt) t))))
 
 ;;;###autoload
-(defun +format*probe (orig-fn)
+(defun +format-probe-a (orig-fn)
   "Use `+format-with' instead, if it is set."
   (if +format-with
       (list +format-with t)
@@ -119,7 +119,7 @@ formatted text, ERRORS are any errors in string format, and FIRST-DIFF is the
 position of the first change in the buffer.
 
 See `+format/buffer' for the interactive version of this function, and
-`+format|buffer' to use as a `before-save-hook' hook."
+`+format-buffer-h' to use as a `before-save-hook' hook."
   (if (not formatter)
       'no-formatter
     (let ((f-function (gethash formatter format-all--format-table))
@@ -228,12 +228,12 @@ is selected)."
 ;; Hooks
 
 ;;;###autoload
-(defun +format|enable-on-save ()
+(defun +format-enable-on-save-h ()
   "Enables formatting on save."
-  (add-hook 'before-save-hook #'+format|buffer nil t))
+  (add-hook 'before-save-hook #'+format-buffer-h nil t))
 
 ;;;###autoload
-(defalias '+format|buffer #'+format/buffer
+(defalias '+format-buffer-h #'+format/buffer
   "Format the source code in the current buffer with minimal feedback.
 
 Meant for `before-save-hook'.")

modules/editor/format/config.el

@@ -25,7 +25,7 @@ Indentation is always preserved when formatting regions.")
 ;;
 ;;; Bootstrap
 
-(defun +format|enable-on-save-maybe ()
+(defun +format-enable-on-save-maybe-h ()
   "Enable formatting on save in certain major modes.
 
 This is controlled by `+format-on-save-enabled-modes'."
@@ -39,7 +39,7 @@ This is controlled by `+format-on-save-enabled-modes'."
     (format-all-mode +1)))
 
 (when (featurep! +onsave)
-  (add-hook 'after-change-major-mode-hook #'+format|enable-on-save-maybe))
+  (add-hook 'after-change-major-mode-hook #'+format-enable-on-save-maybe-h))
 
 
 ;;
@@ -47,7 +47,7 @@ This is controlled by `+format-on-save-enabled-modes'."
 
 ;; Allow a specific formatter to be used by setting `+format-with', either
 ;; buffer-locally or let-bound.
-(advice-add #'format-all--probe :around #'+format*probe)
+(advice-add #'format-all--probe :around #'+format-probe-a)
 
 ;; Doom uses a modded `format-all-buffer', which
 ;;   1. Enables partial reformatting (while preserving leading indentation),

modules/editor/objed/config.el

@@ -3,7 +3,6 @@
 (def-package! objed
   :after-call pre-command-hook
   :config
-
   ;; Prevent undo actions from exiting edit state
   (add-to-list 'objed-keeper-commands 'undo-tree-undo)
   (add-to-list 'objed-keeper-commands 'undo-tree-redo)
@@ -11,21 +10,20 @@
 
   (defvar +objed--extra-face-remaps nil)
 
-  (defun +objed*add-face-remaps (&rest _)
+  (def-advice! +objed-add-face-remaps-a (&rest _)
     "Add extra face remaps when objed activates."
+    :after 'objed--init
     (when (memq 'objed-hl (assq 'hl-line face-remapping-alist))
       (push (face-remap-add-relative 'solaire-hl-line-face 'objed-hl)
             +objed--extra-face-remaps)))
 
-  (defun +objed*remove-face-remaps (&rest _)
+  (def-advice! +objed-remove-face-remaps-a (&rest _)
     "Remove extra face remaps when objed de-activates."
+    :after 'objed--reset
     (unless (memq 'objed-hl (assq 'hl-line face-remapping-alist))
       (dolist (remap +objed--extra-face-remaps)
         (face-remap-remove-relative remap))
       (setq +objed--extra-face-remaps nil)))
 
-  (advice-add 'objed--init :after #'+objed*add-face-remaps)
-  (advice-add 'objed--reset :after #'+objed*remove-face-remaps)
-
   (unless (featurep! +manual)
     (objed-mode +1)))