From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Mon, 4 Oct 2021 08:23:18 +0000 (+0200)
Subject: Revert "Make info-look search harder for the Python info file"
X-Git-Tag: emacs-28.0.90~420
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ef6c43b896bb50ca76e1c79ac6185d95169520f4;p=emacs.git

Revert "Make info-look search harder for the Python info file"

This reverts commit 711eb40b9b9e2aabd0e23ec264e8e8f913329d33.

This leads to loading info-look being excessively slow if the info path is long.  It'll be reimplemented in Emacs 29.
---

diff --git a/lisp/info-look.el b/lisp/info-look.el
index 7cc5462dd4a..cc6a806f56f 100644
--- a/lisp/info-look.el
+++ b/lisp/info-look.el
@@ -43,7 +43,6 @@
 
 (require 'info)
 (eval-when-compile (require 'subr-x))
-(eval-when-compile (require 'cl-lib))
 
 (defgroup info-lookup nil
   "Major mode sensitive help agent."
@@ -905,13 +904,9 @@ Return nil if there is nothing appropriate in the buffer near point."
 
 (info-lookup-maybe-add-help
  :mode 'python-mode
- ;; Debian includes Python info files, but they're version-named
- ;; instead of having a symlink.
- :doc-spec `((,(cl-loop for version from 20 downto 7
-                        for name = (format "python3.%d" version)
-                        if (Info-find-file name t)
-                        return (format "(%s)Index" name)
-                        finally return "(python)Index"))))
+ :doc-spec `((,(if (Info-find-file "python3.9" t)
+                   "(python3.9)Index"
+                 "(python)Index"))))
 
 (info-lookup-maybe-add-help
  :mode 'cperl-mode