diff --git a/core/autoload/help.el b/core/autoload/help.el index 0ca4fb9d9..10ccd8e07 100644 --- a/core/autoload/help.el +++ b/core/autoload/help.el @@ -105,21 +105,6 @@ selection of all minor-modes, active or not." (helpful-function symbol) (helpful-variable symbol)))) -;;;###autoload -(defun doom/describe-symbol (symbol) - "Show help for SYMBOL, a variable, function or macro." - (interactive - (list (helpful--read-symbol "Symbol: " #'helpful--bound-p))) - (let* ((sym (intern-soft symbol)) - (bound (boundp sym)) - (fbound (fboundp sym))) - (cond ((and sym bound (not fbound)) - (helpful-variable sym)) - ((and sym fbound (not bound)) - (helpful-callable sym)) - ((apropos (format "^%s\$" symbol))) - ((apropos (format "%s" symbol)))))) - ;; ;;; Documentation commands diff --git a/core/core-editor.el b/core/core-editor.el index 635d89520..a6a64cc4b 100644 --- a/core/core-editor.el +++ b/core/core-editor.el @@ -389,7 +389,7 @@ files, so we replace calls to `pp' with the much faster `prin1'." (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] #'doom/describe-symbol) + (global-set-key [remap describe-symbol] #'helpful-symbol) (defun doom-use-helpful-a (orig-fn &rest args) "Force ORIG-FN to use helpful instead of the old describe-* commands." diff --git a/modules/lang/emacs-lisp/autoload.el b/modules/lang/emacs-lisp/autoload.el index 94f0221e1..7b211e87b 100644 --- a/modules/lang/emacs-lisp/autoload.el +++ b/modules/lang/emacs-lisp/autoload.el @@ -123,8 +123,8 @@ if it's callable, `apropos' otherwise." (when (invisible-p (point)) (org-show-hidden-entry)))) t)) - (thing (doom/describe-symbol thing)) - ((call-interactively #'doom/describe-symbol)))) + (thing (helpful-symbol (intern thing))) + ((call-interactively #'helpful-at-point)))) ;; FIXME ;; (defun +emacs-lisp-lookup-file (thing)