2 files changed, 29 insertions, 10 deletions

@@ -325,6 +325,7 @@ AKA, DO NOT USE THIS FUNCTION!!!"
    "<help> a" #'consult-apropos
    ;; Isearch integration
    "M-s e" #'consult-isearch)
+  
   (:with-map isearch-mode-map
     (:bind "M-e" #'consult-isearch
            "M-s e" #'consult-isearch
@@ -941,19 +942,34 @@ successive invocations."
   (add-to-list 'auto-mode-alist '("\\.fs\\'" . forth-mode))
   (add-to-list 'auto-mode-alist '("\\.fb\\'" . forth-block-mode)))
 
+
 (setup goto-addr
   (if (fboundp #'global-goto-address-mode)
       (global-goto-address-mode)
     (add-hook 'after-change-major-mode-hook #'goto-address-mode)))
 
-
 ;; TODO: figure out a popper.el / shackle.el ... thing to fix this
 (setup (:straight helpful)
-  (:option helpful-max-buffers 5)
+  (:option helpful-switch-buffer-function
+           (defun helpful-pop-to-buffer (&rest args)
+             (let ((foo
+                    (if (eq major-mode 'helpful-mode)
+                        #'pop-to-buffer-same-window
+                      #'pop-to-buffer)))
+               (apply foo args))))
+  
   (:global "<help> f" #'helpful-callable
            "<help> v" #'helpful-variable
            "<help> k" #'helpful-key
-           "<help> o" #'helpful-symbol))
+           "<help> o" #'helpful-symbol)
+
+  (:bind "q" (defun helpful-quit ()
+               (interactive)
+               (when (eq major-mode 'helpful-mode)
+                 (quit-window)
+                 (unless (or (= 1 (count-windows))
+                             (eq major-mode 'helpful-mode))
+                   (delete-window))))))
 
 (setup (:straight hungry-delete)
   (:option hungry-delete-chars-to-skip " \t"
@@ -1366,7 +1382,7 @@ browser defined in `browse-url-secondary-browser-function'."
     (add-hook (intern (concat (symbol-name mode) "-hook"))
               #'paredit@setup))
   
-  (:also-load 'eldoc)
+  (:also-load eldoc)
   (eldoc-add-command 'paredit-backward-delete 'paredit-close-round))
 
 (setup (:straight paren-face)
@@ -1711,9 +1727,8 @@ If used with a numeric prefix argument N, N backticks will be inserted."
   (:advise variable-pitch-mode :after
            (defun variable-pitch-mode@setup (&rest _)
              "Set up `variable-pitch-mode' with my customizations."
-             (display-fill-column-indicator-mode (if buffer-face-mode
-                                                     -1
-                                                   +1)))))
+             (display-fill-column-indicator-mode
+              (if buffer-face-mode -1 +1)))))
 
 (setup (:straight (vertico
                    :host github
@@ -1804,8 +1819,10 @@ If used with a numeric prefix argument N, N backticks will be inserted."
   (which-key-mode +1))
 
 (setup whitespace
-  (:option  whitespace-style
-            '(empty indentation space-before-tab space-after-tab)
+  (:option  whitespace-style '(empty
+                               indentation
+                               space-before-tab
+                               space-after-tab)
             indent-tabs-mode nil
             tab-width 4
             backward-delete-char-untabify-method 'hungry)
@@ -48,7 +48,9 @@ surrounded by word boundaries."
                                  "")
                                " regexp"
                                (if (with-selected-window reb-target-window
-                                     (region-active-p)) " in region" ""))
+                                     (region-active-p))
+                                   " in region"
+                                 ""))
                        t))
          (pnt (car acdw/re-builder-positions))
          (beg (cadr acdw/re-builder-positions))