Fix shr.el/image build problem

[gnu-emacs] / lisp / finder.el

diff --git a/lisp/finder.el b/lisp/finder.el
index 1ab59f175b826621c304c2d43b314e67385a72cd..da537a59cc1276dcd322ab7db6be14c167d2c61c 100644 (file)
--- a/lisp/finder.el
+++ b/lisp/finder.el
@@ -1,6 +1,6 @@
 ;;; finder.el --- topic & keyword-based code finder
 
-;; Copyright (C) 1992, 1997-1999, 2001-2015 Free Software Foundation,
+;; Copyright (C) 1992, 1997-1999, 2001-2016 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
@@ -193,7 +193,7 @@ from; the default is `load-path'."
        summary keywords package version entry desc)
     (dolist (d (or dirs load-path))
       (when (file-exists-p (directory-file-name d))
-       (message "Directory %s" d)
+       (message "Scanning %s for finder" d)
        (setq package-override
              (intern-soft
               (cdr-safe
@@ -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)))