Auto-commit of loaddefs files.

[gnu-emacs] / lisp / finder.el

diff --git a/lisp/finder.el b/lisp/finder.el
index 0e16b9aa44a81ad72c53e412bfdedb001b0e5a44..ae2afba5bbb172b386422f24b7ecd92260f0767a 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
@@ -32,10 +31,8 @@
 
 (require 'package)
 (require 'lisp-mnt)
-(require 'find-func)                   ;for find-library(-suffixes)
-;; Use `load' rather than `require' so that it doesn't get loaded
-;; during byte-compilation (at which point it might be missing).
-(load "finder-inf" t t)
+(require 'find-func) ;for find-library(-suffixes)
+(require 'finder-inf nil t)
 
 ;; These are supposed to correspond to top-level customization groups,
 ;; says rms.
@@ -200,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
@@ -234,17 +232,10 @@ from; the default is `load-path'."
     (search-backward "\f")
     (insert "(setq package--builtins '(\n")
     (dolist (package package--builtins)
-      (insert "  (")
-      (prin1 (car package) (current-buffer))
-      (insert " .\n    [")
-      (let ((desc (cdr package)))
-       (prin1 (aref desc 0) (current-buffer))
-       (insert " ")
-       (prin1 (aref desc 1) (current-buffer))
-       (insert " ")
-       (prin1 (aref desc 2) (current-buffer)))
-      (insert "])\n"))
-    (insert "    ))\n\n")
+      (insert "  ")
+      (prin1 package (current-buffer))
+      (insert "\n"))
+    (insert "))\n\n")
     ;; Insert hash table.
     (insert "(setq finder-keywords-hash\n      ")
     (prin1 finder-keywords-hash (current-buffer))
@@ -287,7 +278,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)
@@ -325,8 +316,7 @@ not `finder-known-keywords'."
         (packages (gethash id finder-keywords-hash)))
     (unless packages
       (error "No packages matching key `%s'" key))
-    (setq package-menu-sort-key nil)
-    (package--list-packages packages)))
+    (package-show-package-list packages)))
 
 (define-button-type 'finder-xref 'action #'finder-goto-xref)
 
@@ -437,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