[Emacs-diffs] Changes to emacs/lisp/finder.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/06/07 02:42:44

Index: finder.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/finder.el,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- finder.el   5 Jun 2008 07:24:30 -0000       1.76
+++ finder.el   7 Jun 2008 02:42:43 -0000       1.77
@@ -138,7 +138,7 @@
 Optional arguments DIRS are a list of Emacs Lisp directories to compile from;
 no arguments compiles from `load-path'."
   (save-excursion
-    (let (processed summary keystart keywords)
+    (let (processed summary keywords)
       (find-file generated-finder-keywords-file)
       (setq buffer-undo-list t)
       (erase-buffer)
@@ -159,7 +159,7 @@
                 (with-temp-buffer
                   (insert-file-contents (expand-file-name f d))
                   (setq summary (lm-synopsis)
-                        keywords (lm-keywords)))
+                        keywords (lm-keywords-list)))
                 (insert
                  (format "    (\"%s\"\n        "
                          (if (string-match "\\.\\(gz\\|Z\\)$" f)
@@ -167,10 +167,8 @@
                            f)))
                 (prin1 summary (current-buffer))
                 (insert "\n        ")
-                (setq keystart (point))
-                (insert (if keywords (format "(%s)" keywords) "nil")
-                        ")\n")
-                (subst-char-in-region keystart (point) ?, ? )))
+                (princ keywords (current-buffer))
+                (insert ")\n")))
            (directory-files d nil
                              ;; Allow compressed files also.  FIXME:
                              ;; generalize this, especially for