* net/tramp.el (tramp-ssh-controlmaster-template): Make it a

[gnu-emacs] / lisp / finder.el

diff --git a/lisp/finder.el b/lisp/finder.el
index 0c12a08d10410dcee990332d01199a7f001cfb1d..3d988b41bdef3d99eabe86bd214e4d9efe5337d0 100644 (file)
--- a/lisp/finder.el
+++ b/lisp/finder.el
@@ -1,7 +1,7 @@
 ;;; 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-2013 Free Software Foundation,
+;; Inc.
 
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Created: 16 Jun 1992
@@ -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)
@@ -316,7 +317,7 @@ not `finder-known-keywords'."
         (packages (gethash id finder-keywords-hash)))
     (unless packages
       (error "No packages matching key `%s'" key))
-    (package--list-packages packages)))
+    (package-show-package-list packages)))
 
 (define-button-type 'finder-xref 'action #'finder-goto-xref)
 
@@ -427,5 +428,4 @@ Delete the window and kill all Finder-related buffers."
 \f
 (provide 'finder)
 
-;; arch-tag: ec85ff49-8cb8-41f5-a63f-9131d53ce2c5
 ;;; finder.el ends here