From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sat, 27 Aug 2022 13:44:12 +0000 (+0200)
Subject: Make dynamic info-lookup more backwards-compatible
X-Git-Tag: emacs-29.0.90~1893^2~4
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f427b985a1857523412a846fcaa9082c87c0bbd1;p=emacs.git

Make dynamic info-lookup more backwards-compatible

* lisp/info-look.el (info-lookup--expand-info): Don't try to
expand elements that aren't functions (bug#57446).
---

diff --git a/lisp/info-look.el b/lisp/info-look.el
index 7f45f976a24..ce0a08dcbe6 100644
--- a/lisp/info-look.el
+++ b/lisp/info-look.el
@@ -130,7 +130,8 @@ OTHER-MODES is a list of cross references to other help modes.")
 (defun info-lookup--expand-info (info)
   ;; We have a dynamic doc-spec function.
   (when (and (null (nth 3 info))
-             (nth 6 info))
+             (nth 6 info)
+             (functionp (nth 6 info)))
     (setf (nth 3 info) (funcall (nth 6 info))
           (nth 6 info) nil))
   info)