Merge changes made in Gnus trunk.

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

diff --git a/lisp/finder.el b/lisp/finder.el
index 0c12a08..655ad53 100644 (file)
--- a/lisp/finder.el
+++ b/lisp/finder.el
@@ -198,7 +198,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
@@ -278,7 +279,7 @@ from; the default is `load-path'."
                  help-echo finder-help-echo))))
 
 (defun finder-unknown-keywords ()
-  "Return an alist of unknown keywords and number of their occurences.
+  "Return an alist of unknown keywords and number of their occurrences.
 Unknown keywords are those present in `finder-keywords-hash' but
 not `finder-known-keywords'."
   (let (alist)