merge trunk

[bpt/emacs.git] / lisp / finder.el

diff --git a/lisp/finder.el b/lisp/finder.el
index 8471edd..784de0a 100644 (file)
--- a/lisp/finder.el
+++ b/lisp/finder.el
@@ -1,7 +1,6 @@
 ;;; finder.el --- topic & keyword-based code finder
 
-;; Copyright (C) 1992, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1997-1999, 2001-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Created: 16 Jun 1992
@@ -198,7 +197,8 @@ from; the default is `load-path'."
              (setq summary  (lm-synopsis)
                    keywords (mapcar 'intern (lm-keywords-list))
                    package  (or package-override
-                                (intern-soft (lm-header "package"))
+                                (let ((str (lm-header "package")))
+                                  (if str (intern str)))
                                 base-name)
                    version  (lm-header "version")))
            (when summary
@@ -427,5 +427,4 @@ Delete the window and kill all Finder-related buffers."
 \f
 (provide 'finder)
 
-;; arch-tag: ec85ff49-8cb8-41f5-a63f-9131d53ce2c5
 ;;; finder.el ends here