X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/266a86bd7fedf743225c2497956b73ecb2245196..0922b8260ac76c153b253c992c1a656fca1a22e2:/lisp/finder.el

diff --git a/lisp/finder.el b/lisp/finder.el
index 0c12a08d10..c06c01c2c9 100644
--- 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,14 +198,16 @@ 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
 	      (setq version (ignore-errors (version-to-list version)))
 	      (setq entry (assq package package--builtins))
 	      (cond ((null entry)
-		     (push (cons package (vector version nil summary))
+		     (push (cons package
+                                 (package-make-builtin version summary))
 			   package--builtins))
 		    ((eq base-name package)
 		     (setq desc (cdr entry))
@@ -223,13 +225,16 @@ from; the default is `load-path'."
 	      (lambda (a b) (string< (symbol-name (car a))
 				     (symbol-name (car b))))))
 
-  (save-excursion
-    (find-file generated-finder-keywords-file)
+  (with-current-buffer
+      (find-file-noselect generated-finder-keywords-file)
     (setq buffer-undo-list t)
     (erase-buffer)
     (insert (autoload-rubric generated-finder-keywords-file
                              "keyword-to-package mapping" t))
     (search-backward "")
+    ;; FIXME: Now that we have package--builtin-versions, package--builtins is
+    ;; only needed to get the list of unversioned packages and to get the
+    ;; summary description of each package.
     (insert "(setq package--builtins '(\n")
     (dolist (package package--builtins)
       (insert "  ")
@@ -278,7 +283,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 +321,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 +432,4 @@ Delete the window and kill all Finder-related buffers."
 
 (provide 'finder)
 
-;; arch-tag: ec85ff49-8cb8-41f5-a63f-9131d53ce2c5
 ;;; finder.el ends here