dev: merge from master

lisp/cli/sync.el

@@ -79,7 +79,7 @@ OPTIONS:
           (when (and old-version (not (equal old-version emacs-version)))
             (print! (warn "Emacs version has changed since last sync (from %s to %s)") old-version emacs-version)
             (setq to-rebuild t))
-          (when (and (integerp hash)
+          (when (and (stringp hash)
                      (not (equal hash (doom-sync--system-hash))))
             (print! (warn "Your system has changed since last sync"))
             (setq to-rebuild t))
@@ -113,7 +113,19 @@ OPTIONS:
 ;;; Helpers
 
 (defun doom-sync--system-hash ()
-  (sxhash (list doom-local-dir system-type system-configuration-features)))
+  (secure-hash
+   'md5 (mapconcat
+         #'identity
+         (list
+          ;; Changes to this path could indicate a change to the username and/or
+          ;; the location of Straight's build artifacts; both warrant a rebuild
+          ;; of your packages.
+          doom-local-dir
+          ;; Changes to this indicate the user's system/OS has changed (e.g. if
+          ;; the user copied their config to another system, on another OS) or
+          ;; Emacs' compiled features have (even if the major version hasn't).
+          system-configuration)
+         "")))
 
 (defun doom-sync--abort-warning-h ()
   (print! (warn "Script was abruptly aborted, leaving Doom in an incomplete state!"))

lisp/doom-editor.el

@@ -545,61 +545,6 @@ files, so this replace calls to `pp' with the much faster `prin1'."
                          (message ""))))) ; warn silently
         (funcall fn arg)))))
 
-(use-package! helpful
-  ;; a better *help* buffer
-  :commands helpful--read-symbol
-  :hook (helpful-mode . visual-line-mode)
-  :init
-  ;; Make `apropos' et co search more extensively. They're more useful this way.
-  (setq apropos-do-all t)
-
-  (global-set-key [remap describe-function] #'helpful-callable)
-  (global-set-key [remap describe-command]  #'helpful-command)
-  (global-set-key [remap describe-variable] #'helpful-variable)
-  (global-set-key [remap describe-key]      #'helpful-key)
-  (global-set-key [remap describe-symbol]   #'helpful-symbol)
-
-  (defun doom-use-helpful-a (fn &rest args)
-    "Force FN to use helpful instead of the old describe-* commands."
-    (letf! ((#'describe-function #'helpful-function)
-            (#'describe-variable #'helpful-variable))
-      (apply fn args)))
-
-  (after! apropos
-    ;; patch apropos buttons to call helpful instead of help
-    (dolist (fun-bt '(apropos-function apropos-macro apropos-command))
-      (button-type-put
-       fun-bt 'action
-       (lambda (button)
-         (helpful-callable (button-get button 'apropos-symbol)))))
-    (dolist (var-bt '(apropos-variable apropos-user-option))
-      (button-type-put
-       var-bt 'action
-       (lambda (button)
-         (helpful-variable (button-get button 'apropos-symbol))))))
-
-  ;; DEPRECATED: Remove when support for 29 is dropped.
-  (when (= emacs-major-version 29)
-    (defadvice! doom--find-function-search-for-symbol-save-excursion-a (fn &rest args)
-      "Suppress cursor movement by `find-function-search-for-symbol'.
-
-Addresses an unwanted side-effect in `find-function-search-for-symbol' on Emacs
-29 where the cursor is moved to a variable's definition if it's defined in the
-current buffer."
-      :around #'find-function-search-for-symbol
-      (let (buf pos)
-        (letf! (defun find-library-name (library)
-                 (let ((filename (funcall find-library-name library)))
-                   (with-current-buffer (find-file-noselect filename)
-                     (setq buf (current-buffer)
-                           pos (point)))
-                   filename))
-          (prog1 (apply fn args)
-            (when (buffer-live-p buf)
-              (with-current-buffer buf (goto-char pos))))))))
-  :config
-  (setq helpful-set-variable-function #'setq!))
-
 
 (use-package! smartparens
   ;; Auto-close delimiters and blocks as you type. It's more powerful than that,

lisp/doom-projects.el

@@ -121,9 +121,6 @@ Is nil if no executable is found in your PATH during startup.")
   (put 'projectile-ripgrep 'disabled "Use +default/search-project instead")
   (put 'projectile-grep 'disabled "Use +default/search-project instead")
 
-  ;; Treat current directory in dired as a "file in a project" and track it
-  (add-hook 'dired-before-readin-hook #'projectile-track-known-projects-find-file-hook)
-
   ;; Accidentally indexing big directories like $HOME or / will massively bloat
   ;; projectile's cache (into the hundreds of MBs). This purges those entries
   ;; when exiting Emacs to prevent slowdowns/freezing when cache files are

lisp/doom-start.el

@@ -394,7 +394,15 @@ If RETURN-P, return the message as a string instead of displaying it."
               ;; the next file it loads into `user-init-file'.
               (setq user-init-file t)
               (when init-file-name
-                (load init-file-name 'noerror 'nomessage 'nosuffix))
+                (load init-file-name 'noerror 'nomessage 'nosuffix)
+                ;; HACK: if `init-file-name' happens to be higher in
+                ;;   `load-history' than a symbol's actual definition,
+                ;;   `symbol-file' (and help/helpful buffers) will report the
+                ;;   source of a symbol as `init-file-name', rather than it's
+                ;;   true source. By removing this file from `load-history', no
+                ;;   one will make that mistake.
+                (setq load-history (delete (assoc init-file-name load-history)
+                                           load-history)))
               ;; If it's still `t', then it failed to load the profile initfile.
               ;; This likely means the user has forgotten to run `doom sync'!
               (when (eq user-init-file t)

lisp/lib/help.el

@@ -97,10 +97,10 @@ selection of all minor-modes, active or not."
   (let ((symbol
          (cond ((stringp mode) (intern mode))
                ((symbolp mode) mode)
-               ((error "Expected a symbol/string, got a %s" (type-of mode))))))
+               ((error "Expected a symbol/string, got a %s" (type-of mode)))))
-    (if (fboundp symbol)
+        (fn (if (fboundp symbol) #'describe-function #'describe-variable)))
-        (helpful-function symbol)
+    (funcall (or (command-remapping fn) fn)
-      (helpful-variable symbol))))
+             symbol)))
 
 
 ;;
@@ -414,26 +414,44 @@ current file is in, or d) the module associated with the current major mode (see
            (doom-project-browse (file-name-directory path)))
           ((user-error "Aborted module lookup")))))
 
+(defun doom--help-variable-p (sym)
+  "TODO"
+  (or (get sym 'variable-documentation)
+      (and (boundp sym)
+           (not (keywordp sym))
+           (not (memq sym '(t nil))))))
+
 ;;;###autoload
 (defun doom/help-custom-variable (var)
   "Look up documentation for a custom variable.
 
-Unlike `helpful-variable', which casts a wider net that includes internal
+Unlike `describe-variable' or `helpful-variable', which casts a wider net that
-variables, this only lists variables that exist to be customized (defined with
+includes internal variables, this only lists variables that exist to be
-`defcustom')."
+customized (defined with `defcustom')."
   (interactive
-   (list (helpful--read-symbol
+   (list
-          "Custom variable: "
+    (intern (completing-read
-          (helpful--variable-at-point)
+             "Custom variable: " obarray
-          (lambda (sym)
+             (lambda (sym)
-            (and (helpful--variable-p sym)
+               (and (doom--help-variable-p sym)
-                 (custom-variable-p sym)
+                    (custom-variable-p sym)
-                 ;; Exclude minor mode state variables, which aren't meant to be
+                    ;; Exclude minor mode state variables, which aren't meant to
-                 ;; modified directly, but through their associated function.
+                    ;; be modified directly, but through their associated
-                 (not (or (and (string-suffix-p "-mode" (symbol-name sym))
+                    ;; function.
-                               (fboundp sym))
+                    (not (or (and (string-suffix-p "-mode" (symbol-name sym))
-                          (eq (get sym 'custom-set) 'custom-set-minor-mode))))))))
+                                  (fboundp sym))
-  (helpful-variable var))
+                             (eq (get sym 'custom-set) 'custom-set-minor-mode)))))
+             t nil nil (let ((var (variable-at-point)))
+                         ;; `variable-at-point' uses 0 rather than nil to
+                         ;; signify no symbol at point (presumably because 'nil
+                         ;; is a symbol).
+                         (unless (symbolp var)
+                           (setq var nil))
+                         (when (doom--help-variable-p var)
+                           var))))))
+  (funcall (or (command-remapping #'describe-variable)
+               #'describe-variable)
+           var))
 
 
 ;;

lisp/packages.el

@@ -30,7 +30,6 @@
 ;; doom-editor.el
 (package! better-jumper :pin "47622213783ece37d5337dc28d33b530540fc319")
 (package! dtrt-indent :pin "a8aa356684804c52f26602d4e315f1306c6f3e59")
-(package! helpful :pin "4ba24cac9fb14d5fdc32582cd947572040e82b2c")
 (package! smartparens :pin "c7519a1b69f196050a13e2230b7532893b077086")
 (package! ws-butler :pin "e3a38d93e01014cd47bf5af4924459bd145fd7c4")
 

modules/completion/helm/config.el

@@ -103,11 +103,7 @@ Can be negative.")
   (set-popup-rule! "^\\*helm" :vslot -100 :size 0.22 :ttl nil)
 
   ;; Hide minibuffer if `helm-echo-input-in-header-line'
-  (add-hook 'helm-minibuffer-set-up-hook #'helm-hide-minibuffer-maybe)
+  (add-hook 'helm-minibuffer-set-up-hook #'helm-hide-minibuffer-maybe))
-
-  ;; Use helpful instead of describe-* to display documentation
-  (dolist (fn '(helm-describe-variable helm-describe-function))
-    (advice-add fn :around #'doom-use-helpful-a)))
 
 
 (use-package! helm-posframe

modules/completion/ivy/config.el

@@ -226,11 +226,6 @@ workable results ripgrep produces, despite the error."
                (if (= code 2) 0 code)))
       (apply fn args)))
 
-  ;; Integrate with `helpful'
-  (setq counsel-describe-function-function #'helpful-callable
-        counsel-describe-variable-function #'helpful-variable
-        counsel-descbinds-function #'helpful-callable)
-
   ;; Decorate `doom/help-custom-variable' results the same way as
   ;; `counsel-describe-variable' (adds value and docstring columns).
   (ivy-configure 'doom/help-custom-variable :parent 'counsel-describe-variable)

modules/config/default/+emacs-bindings.el

@@ -553,9 +553,6 @@
         "<" #'help-go-back
         "n" #'forward-button
         "p" #'backward-button)
-      (:after helpful
-        :map helpful-mode-map
-        "o" #'link-hint-open-link)
       (:after apropos
         :map apropos-mode-map
         "o" #'link-hint-open-link

modules/config/default/+evil-bindings.el

@@ -102,8 +102,6 @@
 
       (:after help :map help-mode-map
        :n "o"       #'link-hint-open-link)
-      (:after helpful :map helpful-mode-map
-       :n "o"       #'link-hint-open-link)
       (:after info :map Info-mode-map
        :n "o"       #'link-hint-open-link)
       (:after apropos :map apropos-mode-map

modules/editor/evil/autoload/ex.el

@@ -165,8 +165,7 @@ buffers."
   "Look up documentation for QUERY.
 
 If QUERY is in the format of an ex command, it will map it to the underlying
-function and open its documentation with `helpful-function'. Otherwise, it will
+function and open its documentation.
-search for it with `apropos'.
 
 If QUERY is empty, this runs the equivalent of 'M-x apropos'. If BANG is
 non-nil, a search is preformed against Doom's manual (with
@@ -180,8 +179,9 @@ non-nil, a search is preformed against Doom's manual (with
               (or (command-remapping #'apropos)
                   #'apropos)))
             ((string-match "^ *:\\([^ ]+\\)$" query)
-             (helpful-function
+             (funcall (or (command-remapping #'describe-function)
-              (evil-ex-completed-binding (match-string 1 query))))
+                          #'describe-function)
+                      (evil-ex-completed-binding (match-string 1 query))))
             ((message "Searching for %S, this may take a while..." query)
              (apropos query t))))))
 

modules/editor/evil/config.el

@@ -150,15 +150,6 @@ directives. By default, this only recognizes C directives.")
     :after-until #'evil-global-marker-p
     (and (>= char ?2) (<= char ?9)))
 
-  ;; HACK Invoking helpful from evil-ex throws a "No recursive edit is in
-  ;;      progress" error because, between evil-ex and helpful,
-  ;;      `abort-recursive-edit' gets called one time too many.
-  (defadvice! +evil--fix-helpful-key-in-evil-ex-a (key-sequence)
-    :before #'helpful-key
-    (when (evil-ex-p)
-      (run-at-time 0.1 nil #'helpful-key key-sequence)
-      (abort-recursive-edit)))
-
   ;; Make J (evil-join) remove comment delimiters when joining lines.
   (advice-add #'evil-join :around #'+evil-join-a)
 
@@ -464,9 +455,6 @@ directives. By default, this only recognizes C directives.")
        :v  "gR"  #'+eval:replace-region
        ;; Restore these keybinds, since the blacklisted/overwritten gr/gR will
        ;; undo them:
-       (:after helpful
-        :map helpful-mode-map
-        :n "gr" #'helpful-update)
        (:after compile
         :map (compilation-mode-map compilation-minor-mode-map)
         :n "gr" #'recompile)
@@ -571,24 +559,25 @@ directives. By default, this only recognizes C directives.")
       :v "gL" #'evil-lion-right
 
       ;; Emulation of Vim's omni-completion keybinds
-      (:prefix "C-x"
+      (:unless evil-disable-insert-state-bindings
-        (:when (modulep! :completion company)
+        (:prefix "C-x"
-         :i "C-l"  #'+company/whole-lines
+          (:when (modulep! :completion company)
-         :i "C-k"  #'+company/dict-or-keywords
+           :i "C-l"  #'+company/whole-lines
-         :i "C-f"  #'company-files
+           :i "C-k"  #'+company/dict-or-keywords
-         :i "C-]"  #'company-etags
+           :i "C-f"  #'company-files
-         :i "s"    #'company-ispell
+           :i "C-]"  #'company-etags
-         :i "C-s"  #'company-yasnippet
+           :i "s"    #'company-ispell
-         :i "C-o"  #'company-capf
+           :i "C-s"  #'company-yasnippet
-         :i "C-n"  #'+company/dabbrev
+           :i "C-o"  #'company-capf
-         :i "C-p"  #'+company/dabbrev-code-previous)
+           :i "C-n"  #'+company/dabbrev
-        (:when (modulep! :completion corfu)
+           :i "C-p"  #'+company/dabbrev-code-previous)
-         :i "C-l"  #'cape-line
+          (:when (modulep! :completion corfu)
-         :i "C-k"  #'cape-keyword
+           :i "C-l"  #'cape-line
-         :i "C-f"  #'cape-file
+           :i "C-k"  #'cape-keyword
-         :i "C-]"  #'complete-tag
+           :i "C-f"  #'cape-file
-         :i "s"    #'cape-dict
+           :i "C-]"  #'complete-tag
-         :i "C-s"  #'yasnippet-capf
+           :i "s"    #'cape-dict
-         :i "C-o"  #'completion-at-point
+           :i "C-s"  #'yasnippet-capf
-         :i "C-n"  #'cape-dabbrev
+           :i "C-o"  #'completion-at-point
-         :i "C-p"  #'+corfu/dabbrev-this-buffer)))
+           :i "C-n"  #'cape-dabbrev
+           :i "C-p"  #'+corfu/dabbrev-this-buffer))))

modules/lang/emacs-lisp/autoload.el

@@ -116,8 +116,14 @@ if it's callable, `apropos' otherwise."
                            '(outline org-fold-outline))
                  (org-show-hidden-entry))))
            'deferred))
-        (thing (helpful-symbol (intern thing)))
+        (thing
-        ((call-interactively #'helpful-at-point))))
+         (funcall (or (command-remapping #'describe-symbol)
+                      #'describe-symbol)
+                  (intern thing)))
+        ((call-interactively
+          (if (fboundp #'helpful-at-point)
+              #'helpful-at-point
+            #'describe-symbol)))))
 
 ;; DEPRECATED Remove when 28 support is dropped.
 (unless (fboundp 'lisp--local-defform-body-p)

modules/lang/emacs-lisp/config.el

@@ -261,6 +261,77 @@ See `+emacs-lisp-non-package-mode' for details.")
         "s" #'buttercup-run-at-point))
 
 
+(use-package! helpful
+  ;; a better *help* buffer
+  :commands helpful--read-symbol
+  :hook (helpful-mode . visual-line-mode)
+  :init
+  ;; Make `apropos' et co search more extensively. They're more useful this way.
+  (setq apropos-do-all t)
+
+  (global-set-key [remap describe-function] #'helpful-callable)
+  (global-set-key [remap describe-command]  #'helpful-command)
+  (global-set-key [remap describe-variable] #'helpful-variable)
+  (global-set-key [remap describe-key]      #'helpful-key)
+  (global-set-key [remap describe-symbol]   #'helpful-symbol)
+
+  (defun doom-use-helpful-a (fn &rest args)
+    "Force FN to use helpful instead of the old describe-* commands."
+    (letf! ((#'describe-function #'helpful-function)
+            (#'describe-variable #'helpful-variable))
+      (apply fn args)))
+
+  (after! apropos
+    ;; patch apropos buttons to call helpful instead of help
+    (dolist (fun-bt '(apropos-function apropos-macro apropos-command))
+      (button-type-put
+       fun-bt 'action
+       (lambda (button)
+         (helpful-callable (button-get button 'apropos-symbol)))))
+    (dolist (var-bt '(apropos-variable apropos-user-option))
+      (button-type-put
+       var-bt 'action
+       (lambda (button)
+         (helpful-variable (button-get button 'apropos-symbol))))))
+
+  ;; DEPRECATED: Remove when support for 29 is dropped.
+  (when (= emacs-major-version 29)
+    (defadvice! doom--find-function-search-for-symbol-save-excursion-a (fn &rest args)
+      "Suppress cursor movement by `find-function-search-for-symbol'.
+
+Addresses an unwanted side-effect in `find-function-search-for-symbol' on Emacs
+29 where the cursor is moved to a variable's definition if it's defined in the
+current buffer."
+      :around #'find-function-search-for-symbol
+      (let (buf pos)
+        (letf! (defun find-library-name (library)
+                 (let ((filename (funcall find-library-name library)))
+                   (with-current-buffer (find-file-noselect filename)
+                     (setq buf (current-buffer)
+                           pos (point)))
+                   filename))
+          (prog1 (apply fn args)
+            (when (buffer-live-p buf)
+              (with-current-buffer buf (goto-char pos))))))))
+  :config
+  (setq helpful-set-variable-function #'setq!)
+
+  (cond ((modulep! :completion ivy)
+         (setq counsel-describe-function-function #'helpful-callable
+               counsel-describe-variable-function #'helpful-variable
+               counsel-descbinds-function #'helpful-callable))
+        ((modulep! :completion helm)
+         (dolist (fn '(helm-describe-variable helm-describe-function))
+           (advice-add fn :around #'doom-use-helpful-a))))
+
+  ;; Open help:* links with helpful-* instead of describe-*
+  (advice-add #'org-link--open-help :around #'doom-use-helpful-a)
+
+  (map! :map helpful-mode-map
+        :ng "o"  #'link-hint-open-link
+        :n  "gr" #'helpful-update))
+
+
 ;;
 ;;; Project modes
 

modules/lang/emacs-lisp/packages.el

@@ -7,6 +7,7 @@
 (package! highlight-quoted :pin "24103478158cd19fbcfb4339a3f1fa1f054f1469")
 
 ;; Tools
+(package! helpful :pin "4ba24cac9fb14d5fdc32582cd947572040e82b2c")
 (package! macrostep :pin "4939d88779761e8b5461b4cf73f86600172987db")
 (package! overseer :pin "7fdcf1a6fba6b1569a09c1666b4e51bcde266ed9")
 (package! elisp-def :pin "1ad4baccbf3d0d13e7607d332ae6bc60a5dd7360")

modules/lang/org/config.el

@@ -540,9 +540,9 @@ relative to `org-directory', unless it is an absolute path."
   ;; documentation -- especially Doom's!
   (letf! ((defun -call-interactively (fn)
             (lambda (path _prefixarg)
-              (funcall
+              (funcall (or (command-remapping fn) fn)
-               fn (or (intern-soft path)
+                       (or (intern-soft path)
-                      (user-error "Can't find documentation for %S" path))))))
+                           (user-error "Can't find documentation for %S" path))))))
     (org-link-set-parameters
      "kbd"
      :follow (lambda (ev)
@@ -553,12 +553,12 @@ relative to `org-directory', unless it is an absolute path."
      :face 'help-key-binding)
     (org-link-set-parameters
      "var"
-     :follow (-call-interactively #'helpful-variable)
+     :follow (-call-interactively #'describe-variable)
      :activate-func #'+org-link--var-link-activate-fn
      :face '(font-lock-variable-name-face underline))
     (org-link-set-parameters
      "fn"
-     :follow (-call-interactively #'helpful-callable)
+     :follow (-call-interactively #'describe-function)
      :activate-func #'+org-link--fn-link-activate-fn
      :face '(font-lock-function-name-face underline))
     (org-link-set-parameters
@@ -739,9 +739,6 @@ mutating hooks on exported output, like formatters."
   (add-to-list 'org-file-apps '(directory . emacs))
   (add-to-list 'org-file-apps '(remote . emacs))
 
-  ;; Open help:* links with helpful-* instead of describe-*
-  (advice-add #'org-link--open-help :around #'doom-use-helpful-a)
-
   ;; Some uses of `org-fix-tags-on-the-fly' occur without a check on
   ;; `org-auto-align-tags', such as in `org-self-insert-command' and
   ;; `org-delete-backward-char'.