Merge branch 'emacs-25-merge'

[gnu-emacs] / lisp / finder.el

diff --git a/lisp/finder.el b/lisp/finder.el
index 715dd9499fa4852e3786d41d1f377a1082d75c42..c40e04a914741aabc00b9427e1fa2c6b75854335 100644 (file)
--- a/lisp/finder.el
+++ b/lisp/finder.el
@@ -238,7 +238,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.
-                   ((eq base-name package)
+                   ((or (eq base-name package) version)
                     (setq desc (cdr entry))
                     (aset desc 0 version)
                     (aset desc 2 summary)))