refactor: remove dead wrappers and commented-out blocks

Drop cj/apply-browser-choice (browser-config) and cj/load-fallback-theme (ui-theme), orphaned wrappers with no caller that just duplicated logic the live paths already inline, plus their tests. Delete commented-out blocks: a duplicate contact capture template (org-contacts-config), a disabled personal-info-dir :init (help-config), a stale TODO setq (org-config), and an old commented regex (test-runner).

8 files changed, 1 insertions, 74 deletions

diff --git a/modules/browser-config.el b/modules/browser-config.el
index 4a2c54623..0312cdd18 100644
--- a/modules/browser-config.el
+++ b/modules/browser-config.el
@@ -109,12 +109,6 @@ Returns: \\='success if applied successfully,
           (set program-var (or path executable)))
         'success))))
 
-(defun cj/apply-browser-choice (browser-plist)
-  "Apply the browser settings from BROWSER-PLIST."
-  (pcase (cj/--do-apply-browser-choice browser-plist)
-    ('success (message "Default browser set to: %s" (plist-get browser-plist :name)))
-    ('invalid-plist (message "Invalid browser configuration"))))
-
 (defun cj/--do-choose-browser (browser-plist)
   "Save and apply BROWSER-PLIST as the default browser.
 Returns: \\='success if browser was saved and applied,
diff --git a/modules/help-config.el b/modules/help-config.el
index df27cbea9..f8431aef2 100644
--- a/modules/help-config.el
+++ b/modules/help-config.el
@@ -105,15 +105,7 @@ Preserves any unsaved changes and checks if the file exists."
   :bind
   (:map Info-mode-map
 		("m" . bookmark-set) ;; Rebind 'm' from Info-menu to bookmark-set
-		("M" . Info-menu))   ;; Move Info-menu to 'M' instead
-  :init
-  ;; Add personal info files BEFORE Info mode initializes
-  ;; (let ((personal-info-dir (expand-file-name "assets/info" user-emacs-directory)))
-  ;; 	(when (file-directory-p personal-info-dir)
-  ;;    (setq Info-directory-list (list personal-info-dir))))
-  ;; the above makes the directory the info list. the below adds it to the default list
-  ;;	(add-to-list 'Info-default-directory-list personal-info-dir)))
-  )
+		("M" . Info-menu)))   ;; Move Info-menu to 'M' instead
 
 (provide 'help-config)
 ;;; help-config.el ends here.
diff --git a/modules/org-config.el b/modules/org-config.el
index e7538f244..8d722ad46 100644
--- a/modules/org-config.el
+++ b/modules/org-config.el
@@ -44,9 +44,6 @@
   (setq org-startup-indented t)             ;; load org files indented
   (setq org-adapt-indentation t)            ;; adapt indentation to outline node level
 
-  ;; TASK: this variable doesn't exist. Remove
-  ;;  (setq org-indent-indentation-per-level 2) ;; indent two character-widths per level
-
   ;; IMAGES / MEDIA
   (setq org-startup-with-inline-images t)   ;; preview images by default
   (setq org-image-actual-width '(500))      ;; keep image sizes in check
diff --git a/modules/org-contacts-config.el b/modules/org-contacts-config.el
index d558245b6..556530eb2 100644
--- a/modules/org-contacts-config.el
+++ b/modules/org-contacts-config.el
@@ -115,14 +115,6 @@
 Added: %U"
                  :prepare-finalize cj/org-contacts-finalize-birthday-timestamp)))
 
-;; TASK: What purpose did this serve?
-;; duplicate?!?
-;; (with-eval-after-load 'org-capture
-;;   (add-to-list 'org-capture-templates
-;;             '("C" "Contact" entry (file+headline contacts-file "Contacts")
-;;               "* %(cj/org-contacts-template-name)
-;; Added: %U")))
-
 (defun cj/org-contacts-template-name ()
   "Get name for contact template from context."
   (or (when (eq major-mode 'mu4e-headers-mode)
diff --git a/modules/test-runner.el b/modules/test-runner.el
index 25c38f968..50d4f7e40 100644
--- a/modules/test-runner.el
+++ b/modules/test-runner.el
@@ -358,7 +358,6 @@ Returns a list of test name symbols defined in the file."
 	  (insert-file-contents file)
 	  (goto-char (point-min))
 	  ;; Find all (ert-deftest NAME ...) forms
-;;	  (while (re-search-forward "^\s-*(ert-deftest\s-+\\(\\(?:\\sw\\|\\s_\\)+\\)" nil t)
 	  (while (re-search-forward "^[[:space:]]*(ert-deftest[[:space:]]+\\(\\(?:\\sw\\|\\s_\\)+\\)" nil t)
 		(push (match-string 1) test-names)))
 	test-names))
diff --git a/modules/ui-theme.el b/modules/ui-theme.el
index 8be3b4fdf..eb4efd9b5 100644
--- a/modules/ui-theme.el
+++ b/modules/ui-theme.el
@@ -139,12 +139,6 @@ Returns fallback-theme-name if no theme is active."
       (message "Cannot save theme: %s is unwriteable" theme-file)
     (message "%s theme saved to %s" (cj/get-active-theme-name) theme-file)))
 
-(defun cj/load-fallback-theme (msg)
-  "Display MSG and load ui-theme fallback-theme-name.
-Used to handle errors with loading persisted theme."
-  (cj/theme-disable-all)
-  (cj/theme-load-fallback msg))
-
 (defun cj/load-theme-from-file ()
   "Apply the theme name contained in theme-file as the active UI theme.
 If the theme is nil, it disables all current themes. If an error occurs
diff --git a/tests/test-browser-config.el b/tests/test-browser-config.el
index 7faecbfc8..9fe5b02e4 100644
--- a/tests/test-browser-config.el
+++ b/tests/test-browser-config.el
@@ -273,29 +273,6 @@
       (should (string= (plist-get loaded :name) "Second"))))
   (test-browser-teardown))
 
-;;; Public wrappers (message side-effects mocked)
-
-(ert-deftest test-browser-apply-wrapper-success-messages-name ()
-  "Normal: =cj/apply-browser-choice= reports the chosen name on success."
-  (test-browser-setup)
-  (let ((browser (test-browser-make-plist "Wrapper Test"))
-        (received nil))
-    (cl-letf (((symbol-function 'message)
-               (lambda (fmt &rest args) (setq received (apply #'format fmt args)))))
-      (cj/apply-browser-choice browser))
-    (should (string-match-p "Wrapper Test" received))
-    (should (string-match-p "Default browser set" received)))
-  (test-browser-teardown))
-
-(ert-deftest test-browser-apply-wrapper-invalid-plist-messages-error ()
-  "Error: =cj/apply-browser-choice= surfaces an error message for a bad plist."
-  (test-browser-setup)
-  (let ((received nil))
-    (cl-letf (((symbol-function 'message)
-               (lambda (fmt &rest args) (setq received (apply #'format fmt args)))))
-      (cj/apply-browser-choice nil))
-    (should (string-match-p "Invalid" received)))
-  (test-browser-teardown))
 
 (ert-deftest test-browser-initialize-wrapper-loaded-branch-applies ()
   "Normal: =cj/initialize-browser= applies the saved browser when one is loaded."
diff --git a/tests/test-ui-theme-commands.el b/tests/test-ui-theme-commands.el
index 4e3ce7f28..1b273cf57 100644
--- a/tests/test-ui-theme-commands.el
+++ b/tests/test-ui-theme-commands.el
@@ -7,7 +7,6 @@
 ;;   cj/switch-themes
 ;;   cj/save-theme-to-file
 ;;   cj/get-active-theme-name
-;;   cj/load-fallback-theme
 
 ;;; Code:
 
@@ -68,23 +67,6 @@ does not raise."
       (cj/save-theme-to-file))
     (should (string-match-p "Cannot save theme" messaged))))
 
-;;; cj/load-fallback-theme
-
-(ert-deftest test-ui-theme-load-fallback-disables-then-loads ()
-  "Normal: load-fallback-theme disables all then loads the fallback."
-  (let ((fallback-theme-name "modus-vivendi")
-        (custom-enabled-themes '(old-one old-two))
-        disabled loaded)
-    (cl-letf (((symbol-function 'disable-theme)
-               (lambda (theme) (push theme disabled)))
-              ((symbol-function 'load-theme)
-               (lambda (theme &optional _no-confirm _no-enable)
-                 (push theme loaded)))
-              ((symbol-function 'message) #'ignore))
-      (cj/load-fallback-theme "boom"))
-    (should (equal (sort (copy-sequence disabled) #'string<) '(old-one old-two)))
-    (should (equal loaded '(modus-vivendi)))))
-
 ;;; cj/switch-themes
 
 (ert-deftest test-ui-theme-switch-disables-loads-then-saves ()