From: Stephen Gildea <stepheng+emacs@gildea.com>
Date: Thu, 26 Aug 2021 00:39:26 +0000 (-0700)
Subject: Fix "Finder" description for multi-file packages
X-Git-Tag: emacs-28.0.90~1193^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0aa0410372;p=emacs.git

Fix "Finder" description for multi-file packages

* lisp/finder.el (finder-compile-keywords):  Now that 'version' is
set for more files, it is no longer necessary to check that we have
a version when picking the file from which to take the description.
Doing so caused built-in packages (where the version is known) to have
their package description taken from the last .el file that matched the
file name pattern, usually the last source file in the sub-directory.

This bug was introduced in July 2019 and first released in Emacs 27.1.

Thanks to Michael Albinus for reviewing this patch.
---

diff --git a/lisp/finder.el b/lisp/finder.el
index d79b9c99f66..b8db62865de 100644
--- a/lisp/finder.el
+++ b/lisp/finder.el
@@ -253,7 +253,7 @@ from; the default is `load-path'."
 		  ;; The idea here is that eg calc.el gets to define
 		  ;; the description of the calc package.
 		  ;; This does not work for eg nxml-mode.el.
-		  ((or (eq base-name package) version)
+		  ((eq base-name package)
 		   (setq desc (cdr entry))
 		   (aset desc 0 version)
 		   (aset desc 2 summary)))