* finder.el (generated-finder-keywords-file): New variable.

(finder-compile-keywords): Use it instead of hardcoding
finder-inf.el.

diff --git a/lisp/finder.el b/lisp/finder.el
index 6c6d386dfdb962dec7942a705a2fb59eefab80e9..21ff1c9106329d22fa422c82a17c54dc7611d869 100644 (file)
--- a/lisp/finder.el
+++ b/lisp/finder.el
@@ -110,15 +110,19 @@
 (defvar finder-package-info nil
   "Assoc list mapping file names to description & keyword lists.")
 
+(defvar generated-finder-keywords-file "finder-inf.el"
+  "File \\[finder-compile-keywords] puts finder keywords into.")
+
 (defun finder-compile-keywords (&rest dirs)
-  "Regenerate the keywords association list into the file `finder-inf.el'.
+  "Regenerate the keywords association list into `generated-finder-keywords-file'.
 Optional arguments DIRS are a list of Emacs Lisp directories to compile from;
 no arguments compiles from `load-path'."
   (save-excursion
     (let ((processed nil))
-      (find-file "finder-inf.el")
+      (find-file generated-finder-keywords-file)
       (erase-buffer)
-      (insert ";;; finder-inf.el --- keyword-to-package mapping\n")
+      (insert ";;; " (file-name-nondirectory generated-finder-keywords-file)
+             " --- keyword-to-package mapping\n")
       (insert ";; This file is part of GNU Emacs.\n")
       (insert ";;; Commentary:\n")
       (insert ";; Don't edit this file.  It's generated by finder.el\n\n")
@@ -166,14 +170,15 @@ no arguments compiles from `load-path'."
            (directory-files (or d ".")))))
        (or dirs load-path))
       (insert "))\n
-\(provide 'finder-inf)
+\(provide '" (file-name-sans-extension
+             (file-name-nondirectory generated-finder-keywords-file)) ")
 
 ;;; Local Variables:
 ;;; version-control: never
 ;;; no-byte-compile: t
 ;;; no-update-autoloads: t
 ;;; End:
-;;; finder-inf.el ends here\n")
+;;; " (file-name-nondirectory generated-finder-keywords-file) " ends here\n")
       (kill-buffer "*finder-scratch*")
       (eval-current-buffer) ;; So we get the new keyword list immediately
       (basic-save-buffer))))