2 files changed, 35 insertions, 26 deletions

@@ -345,6 +345,7 @@ In short, DO NOT USE THIS FUNCTION!!!"
   (blink-cursor-mode +1))
 
 (setup cus-edit
+  (:also-load acdw-cus-edit)
   (:option custom-file (acdw/dir "custom.el")
            custom-magic-show nil
            custom-magic-show-button t
@@ -359,34 +360,10 @@ In short, DO NOT USE THIS FUNCTION!!!"
 
   ;; `Custom-mode-hook' fires /before/ the widgets are built, so I have to
   ;; install advice after the widgets are made.
-  (:advise custom-buffer-create :after
-           (defun custom-buffer@expand-widgets (&rest _)
-             "Expand descriptions in `Custom-mode' buffers."
-             (interactive)
-             ;; "More/Hide" widgets (thanks alphapapa!)
-             (widget-map-buttons (lambda (widget _)
-                                   (pcase (widget-get widget :off)
-                                     ("More" (widget-apply-action widget)))
-                                   nil))
-             ;; "Show Value" widgets (the little triangles)
-             (widget-map-buttons (lambda (widget _)
-                                   (pcase (widget-get widget :off)
-                                     ("Show Value"
-                                      (widget-apply-action widget)))
-                                   nil))))
+  (:advise custom-buffer-create-internal :after #'acdw-cus/expand-widgets)
 
   (:with-mode Custom-mode
-    (:local-set imenu-generic-expression ; thanks u/oantolin!
-                '(("Faces" (rx (seq bol
-                                    (or "Show" "Hide") " "
-                                    (group (zero-or-more nonl))
-                                    " face: [sample]"))
-                   1)
-                  ("Variables" (rx (seq bol
-                                        (or "Show Value" "Hide") " "
-                                        (group (zero-or-more
-                                                (not (any "\n:"))))))
-                   1)))))
+    (:local-set imenu-generic-expression acdw-cus/imenu-generic-expression)))
 
 (setup debugger
   (:hook visual-line-mode))
@@ -0,0 +1,32 @@
+;;; acdw-cus-edit.el -*- lexical-binding: t -*-
+
+(defun acdw-cus/expand-widgets (&rest _)
+  "Expand descriptions in `Custom-mode' buffers."
+  (interactive)
+  ;; "More/Hide" widgets (thanks alphapapa!)
+  (widget-map-buttons (lambda (widget _)
+                        (pcase (widget-get widget :off)
+                          ("More" (widget-apply-action widget)))
+                        nil))
+  ;; "Show Value" widgets (the little triangles)
+  (widget-map-buttons (lambda (widget _)
+                        (pcase (widget-get widget :off)
+                          ("Show Value"
+                           (widget-apply-action widget)))
+                        nil)))
+
+(defvar acdw-cus/imenu-generic-expression ; thanks u/oantolin!
+  '(("Faces" (rx (seq bol
+                      (or "Show" "Hide") " "
+                      (group (zero-or-more nonl))
+                      " face: [sample]"))
+     1)
+    ("Variables" (rx (seq bol
+                          (or "Show Value" "Hide") " "
+                          (group (zero-or-more
+                                  (not (any "\n:"))))))
+     1))
+  "Show faces and variables in `imenu'.")
+
+(provide 'acdw/cus-edit)
+;;; acdw-cus-edit.el ends here