💥 revise hook/var fns naming convention (2/2)

This is second of three big naming convention changes. In this commit,
we change the naming conventions for hook functions and variable
functions:

1. Replace the bar | to indicate a hook function with a -h suffix, e.g.

     doom|init-ui -> doom-init-ui-h
     doom|run-local-var-hooks -> doom-run-local-var-hooks-h

2. And add a -fn suffix for functions meant to be set on variables,
   e.g.

     (setq magit-display-buffer-function #'+magit-display-buffer-fn)

See ccf327f8 for the reasoning behind these changes.

modules/tools/lsp/config.el

@@ -23,15 +23,15 @@
 (def-package! lsp-ui
   :hook (lsp-mode . lsp-ui-mode)
   :init
-  (defun +lsp|init-ui-flycheck-or-flymake ()
-    "Sets up flymake-mode or flycheck-mode, depending on `lsp-prefer-flymake'."
-    (unless (eq :none lsp-prefer-flymake)
-      (if (and (not (version< emacs-version "26.1"))
-               lsp-prefer-flymake)
-          (lsp--flymake-setup))
-      (require 'lsp-ui-flycheck)
-      (lsp-ui-flycheck-enable t)))
-  (add-hook 'lsp-ui-mode-hook #'+lsp|init-ui-flycheck-or-flymake)
+  (add-hook 'lsp-ui-mode-hook
+    (defun +lsp-init-ui-flycheck-or-flymake-h ()
+      "Sets up flymake-mode or flycheck-mode, depending on `lsp-prefer-flymake'."
+      (unless (eq :none lsp-prefer-flymake)
+        (if (and (not (version< emacs-version "26.1"))
+                 lsp-prefer-flymake)
+            (lsp--flymake-setup))
+        (require 'lsp-ui-flycheck)
+        (lsp-ui-flycheck-enable t))))
   :config
   (setq lsp-prefer-flymake nil
         lsp-ui-doc-max-height 8
@@ -52,11 +52,11 @@
   :init
   ;; Make sure that `company-capf' is disabled since it is incompatible with
   ;; `company-lsp' (see lsp-mode#884)
-  (defun +lsp|init-company ()
-    (if (not (bound-and-true-p company-mode))
-        (add-hook 'company-mode-hook #'+lsp|init-company t t)
-      (setq-local company-backends
+  (add-hook 'lsp-mode-hook
+    (defun +lsp-init-company-h ()
+      (if (not (bound-and-true-p company-mode))
+          (add-hook 'company-mode-hook #'+lsp-init-company-h t t)
+        (setq-local company-backends
                     (cons 'company-lsp
                           (remq 'company-capf company-backends)))
-      (remove-hook 'company-mode-hook #'+lsp|init-company t)))
-  (add-hook 'lsp-mode-hook #'+lsp|init-company))
+        (remove-hook 'company-mode-hook #'+lsp-init-company-h t)))))

modules/tools/magit/autoload.el

@@ -1,7 +1,7 @@
 ;;; tools/magit/autoload.el -*- lexical-binding: t; -*-
 
 ;;;###autoload
-(defun +magit-display-buffer (buffer)
+(defun +magit-display-buffer-fn (buffer)
   "Marries `magit-display-buffer-fullcolumn-most-v1' with
 `magit-display-buffer-same-window-except-diff-v1', except:
 

modules/tools/magit/config.el

@@ -32,7 +32,7 @@ It is passed a user and repository name.")
   ;; 2. The status screen isn't buried when viewing diffs or logs from the
   ;;    status screen.
   (setq transient-display-buffer-action '(display-buffer-below-selected)
-        magit-display-buffer-function #'+magit-display-buffer)
+        magit-display-buffer-function #'+magit-display-buffer-fn)
   (set-popup-rule! "^\\(?:\\*magit\\|magit:\\| \\*transient\\*\\)" :ignore t)
 
   ;; Add --tags switch
@@ -40,11 +40,11 @@ It is passed a user and repository name.")
     "-p" '("-t" "Fetch all tags" ("-t" "--tags")))
 
   ;; so magit buffers can be switched to (except for process buffers)
-  (defun +magit-buffer-p (buf)
-    (with-current-buffer buf
-      (and (derived-mode-p 'magit-mode)
-           (not (eq major-mode 'magit-process-mode)))))
-  (add-to-list 'doom-real-buffer-functions #'+magit-buffer-p nil #'eq)
+  (add-hook 'doom-real-buffer-functions
+    (defun +magit-buffer-p (buf)
+      (with-current-buffer buf
+        (and (derived-mode-p 'magit-mode)
+             (not (eq major-mode 'magit-process-mode))))))
 
   ;; properly kill leftover magit buffers on quit
   (define-key magit-status-mode-map [remap magit-mode-bury-buffer] #'+magit/quit)