bug#29611: 25.3; help navigation error

bug#29611: 25.3; help navigation error

[Alex Branham]

Clicking on a specific link from a specific help buffer results in an error. On Emacs 25.3, from emacs -q:

M-/ (dabbrev-expand)

C-h v dabbrev-select-buffers-function

<TAB> <TAB> <RET> (navigate to the second link and click it)

results in:

apply: Wrong number of arguments: #[(fun file &optional type) "ÄÅ!ˆ\bÆ=ƒ.

bug#29611: 25.3; help navigation error

[Glenn Morris]

Version: 26.0.91

Thanks; looks like an old bug.

commit c0a670a (HEAD, origin/emacs-26, emacs-26)
Date:   Thu Dec 7 20:30:39 2017 -0500

    * lisp/help-mode.el (help-function-def):
    Allow help-make-xrefs to call with one argument.  (Bug#29611)

diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index a98bce0..8bafa46 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -192,20 +192,24 @@ 'help-customize-face
 
 (define-button-type 'help-function-def
   :supertype 'help-xref
-  'help-function (lambda (fun file &optional type)
-		   (require 'find-func)
-		   (when (eq file 'C-source)
-		     (setq file
-			   (help-C-file-name (indirect-function fun) 'fun)))
-		   ;; Don't use find-function-noselect because it follows
-		   ;; aliases (which fails for built-in functions).
-		   (let ((location
-			  (find-function-search-for-symbol fun type file)))
-		     (pop-to-buffer (car location))
-			 (run-hooks 'find-function-after-hook)
-		     (if (cdr location)
-			 (goto-char (cdr location))
-		       (message "Unable to find location in file"))))
+  'help-function (lambda (fun &optional file type)
+                   (or file
+                       (setq file (find-lisp-object-file-name fun type)))
+                   (if (not file)
+                       (message "Unable to find defining file")
+                     (require 'find-func)
+                     (when (eq file 'C-source)
+                       (setq file
+                             (help-C-file-name (indirect-function fun) 'fun)))
+                     ;; Don't use find-function-noselect because it follows
+                     ;; aliases (which fails for built-in functions).
+                     (let ((location
+                            (find-function-search-for-symbol fun type file)))
+                       (pop-to-buffer (car location))
+                       (run-hooks 'find-function-after-hook)
+                       (if (cdr location)
+                           (goto-char (cdr location))
+                         (message "Unable to find location in file")))))
   'help-echo (purecopy "mouse-2, RET: find function's definition"))
 
 (define-button-type 'help-function-cmacro ; FIXME: Obsolete since 24.4.
@@ -495,12 +499,6 @@ help-make-xrefs
                                  (help-xref-button 8 'help-face sym)))
                            ((match-string 6)) ; nothing for `symbol'
                            ((match-string 7)
-                            ;; this used:
-                            ;; #'(lambda (arg)
-                            ;;     (let ((location
-                            ;;            (find-function-noselect arg)))
-                            ;;       (pop-to-buffer (car location))
-                            ;; 	(goto-char (cdr location))))
                             (help-xref-button 8 'help-function-def sym))
                            ((cl-some (lambda (x) (funcall (nth 1 x) sym))
                                      describe-symbol-backends)