Change :option to setq-default for some setup forms

:option loads the symbols with custom-load-symbol, but for some of the settings
I don't care about that.

1 files changed, 31 insertions, 25 deletions

@@ -324,17 +324,23 @@
            eldoc-echo-area-use-multiline-p nil))
 
 (setup flyspell
-  (:option ispell-program-name "hunspell"
-           ispell-dictionary "en_US"
-           ispell-personal-dictionary "~/.hunspell_personal")
+  (setq-default ispell-program-name "hunspell"
+                ispell-dictionary "en_US"
+                ispell-personal-dictionary "~/.hunspell_personal")
   (:needs ispell-program-name) ; don't proceed if not installed
   
-  (ispell-set-spellchecker-params)
   (unless (file-exists-p ispell-personal-dictionary)
     (write-region "" nil ispell-personal-dictionary nil 0))
 
-  (add-hook 'text-mode-hook #'flyspell-mode)
-  (add-hook 'prog-mode-hook #'flyspell-prog-mode))
+  (defun flyspell-start ()
+    "Start `flyspell-mode' or `flyspell-prog-mode', depending on current mode."
+    (interactive)
+    (cond ((derived-mode-p 'text-mode)
+           (flyspell-mode))
+          ((derived-mode-p 'prog-mode)
+           (flyspell-prog-mode))
+          (t (message "Non-text or -prog mode.  Run `flyspell-mode'."))))
+  (:leader "s" flyspell-start))
 
 (setup scratch
   (hook-defun immortal-scratch kill-buffer-query-functions
@@ -397,13 +403,13 @@
            ediff-split-window-function 'split-window-horizontally))
 
 (setup browse-url
-  (:option browse-url-browser-function 'eww-browse-url
-           browse-url-secondary-browser-function
-           (if (executable-find "firefox")
-               'browse-url-firefox
-             'browse-url-default-browser)
-           browse-url-new-window-flag t
-           browse-url-firefox-new-window-is-tab t)
+  (setq-default browse-url-browser-function 'eww-browse-url
+                browse-url-secondary-browser-function
+                (if (executable-find "firefox")
+                    'browse-url-firefox
+                  'browse-url-default-browser)
+                browse-url-new-window-flag t
+                browse-url-firefox-new-window-is-tab t)
   (when (eq acdw/system :work)
     (add-to-list 'exec-path "C:/Program Files/Mozilla Firefox")))
 
@@ -442,17 +448,17 @@
   (:mode "\\.\\(gemini\\|gmi\\)\\'"))
 
 (setup dired
-  (:option dired-recursive-copies 'always
-           dired-recursive-deletes 'always
-           delete-by-moving-to-trash t
-           dired-listing-switches "-Al"
-           ls-lisp-dirs-first t
-           dired-ls-F-marks-symlinks t
-           dired-no-confirm '(byte-compile
-                              chgrp chmod chown copy
-                              hardlink load move
-                              shell touch symlink)
-           dired-dwim-target t)
+  (setq-default dired-recursive-copies 'always
+                dired-recursive-deletes 'always
+                delete-by-moving-to-trash t
+                dired-listing-switches "-Al"
+                ls-lisp-dirs-first t
+                dired-ls-F-marks-symlinks t
+                dired-no-confirm '(byte-compile
+                                   chgrp chmod chown copy
+                                   hardlink load move
+                                   shell touch symlink)
+                dired-dwim-target t)
   (:also-load dired-x)
   (:hook dired-hide-details-mode
          hl-line-mode)
@@ -469,7 +475,7 @@
       (:hook-into dired-mode))
 
     (setup (:straight trashed)
-      (:option trashed-action-confirmer 'y-or-n-p))))
+      (setq-default trashed-action-confirmer 'y-or-n-p))))
 
 (setup (:straight magit)
   (:leader "g" magit-status)