emacs-31 f9a8c61f504: Fix 'eldoc-show-help-at-pt'

Eli Zaretskii <[email protected]> Thu, 9 Jul 2026 11:07:14 -0400 (EDT)
Newsgroups gmane.emacs.diffs
Message-ID <[email protected]>
branch: emacs-31
commit f9a8c61f504288f0e14ca1a3781281af545b7f90
Author: Daniel Mendler <[email protected]>
Commit: Eli Zaretskii <[email protected]>

    Fix 'eldoc-show-help-at-pt'
    
    * lisp/emacs-lisp/eldoc.el (eldoc-show-help-at-pt): Don't test
    'eldoc-help-at-pt'.  (Bug#81356)
---
 lisp/emacs-lisp/eldoc.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index d1c56b7f82f..963a7d2ea4d 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -982,7 +982,7 @@ the docstrings eventually produced, using
 (defun eldoc-show-help-at-pt (&rest _)
   "Show help at point via Eldoc if `eldoc-help-at-pt' is non-nil.
 Intended for `eldoc-documentation-functions' (which see)."
-  (when-let* ((help (and eldoc-help-at-pt (help-at-pt-kbd-string))))
+  (when-let* ((help (help-at-pt-kbd-string)))
     (format "Help: %s" (substitute-command-keys help))))