From a5fe45e8db98f2405b6ec3d325d9d4366434faa7 Mon Sep 17 00:00:00 2001
From: Case Duckworth
Date: Fri, 21 May 2021 10:48:05 -0500
Subject: Comment out `hook-defun'

The only plus `hook-defun' has over (add-hook 'hook (defun name ... )) is the
ability to add the same function to multiple hooks at once.  My init files
don't use that functionality, so I've retired this macro for now.

I'm thinking, honestly, that if a function is used in more than one hook, it
should be defined separately and added to each hook in turn ... you know, like
Emacs does it by default.
---
 early-init.el | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

(limited to 'early-init.el')

diff --git a/early-init.el b/early-init.el
index 622d220..bb717d6 100644
--- a/early-init.el
+++ b/early-init.el
@@ -34,11 +34,12 @@
       inhibit-x-resources t)
 (acdw/gc-disable)
 
-(hook-defun post-init-reset after-init-hook
-  (acdw/gc-enable)
-  (dolist (handler file-name-handler-alist)
-    (add-to-list 'orig-file-name-handler-alist handler))
-  (setq file-name-handler-alist orig-file-name-handler-alist))
+(add-hook 'after-init-hook
+          (defun after-init@reset ()
+            (acdw/gc-enable)
+            (dolist (handler file-name-handler-alist)
+              (add-to-list 'orig-file-name-handler-alist handler))
+            (setq file-name-handler-alist orig-file-name-handler-alist)))
 
 ;;; Frame settings
 (setq default-frame-alist               ; Remove most UI
@@ -60,18 +61,6 @@
       inhibit-x-resources t             ; Don't load ~/.Xresources
       )
 
-(hook-defun disable-ui-modes after-init-hook
-  (dolist (mode ;; each mode is of the form (MODE . FRAME-ALIST-VAR)
-           '((tool-bar-mode . tool-bar-lines)
-             (menu-bar-mode . menu-bar-lines)
-             (scroll-bar-mode . vertical-scroll-bars)
-             (horizontal-scroll-bar-mode . horizontal-scroll-bars)
-             ))
-    (let ((setting (alist-get (cdr mode) default-frame-alist)))
-      (when (or (not setting)
-                (= 0 setting))
-        (funcall (car mode) -1)))))
-
 (add-function :after after-focus-change-function
               (defun acdw/first-frame-setup ()
                 ;; fonts
@@ -96,6 +85,19 @@
                 ;; only run this once
                 (remove-function after-focus-change-function
                                  'acdw/first-frame-setup)))
+(add-hook 'after-init-hook
+          (defun after-init@disable-ui-modes ()
+            (dolist (mode ;; each mode is of the form (MODE . FRAME-ALIST-VAR)
+                     '((tool-bar-mode . tool-bar-lines)
+                       (menu-bar-mode . menu-bar-lines)
+                       (scroll-bar-mode . vertical-scroll-bars)
+                       (horizontal-scroll-bar-mode . horizontal-scroll-bars)
+                       ))
+              (let ((setting (alist-get (cdr mode) default-frame-alist)))
+                (when (or (not setting)
+                          (= 0 setting))
+                  (funcall (car mode) -1))))))
+
 
 
 ;;; Bootstrap package manager (`straight.el')
-- 
cgit 1.4.1-21-gabe81