(replace_buffer_in_all_windows):

[bpt/emacs.git] / lisp / cus-dep.el

diff --git a/lisp/cus-dep.el b/lisp/cus-dep.el
index d2364c2..286d483 100644 (file)
--- a/lisp/cus-dep.el
+++ b/lisp/cus-dep.el
@@ -5,36 +5,61 @@
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: internal
 
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
 ;;; Code:
 
 (require 'cl)
-(load-file "widget.el")
-(load-file "custom.el")
-(load-file "cus-face.el")
+(require 'widget)
+(require 'cus-face)
 
 (defun custom-make-dependencies ()
   "Batch function to extract custom dependencies from .el files.
-Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies"
+Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS"
   (let ((enable-local-eval nil)
-       (files (directory-files "" nil "\\`[^=].*\\.el\\'" t))
-       file)
-    (while files
-      (setq file (car files)
-           files (cdr files))
-      (message "Checking %s..." file)
-      (set-buffer (find-file-noselect file))
-      (goto-char (point-min))
-      (string-match "\\`\\(.*\\)\\.el\\'" file)
-      (condition-case nil
-         (let ((name (file-name-nondirectory (match-string 1 file))))
-           (while t
-             (let ((expr (read (current-buffer))))
-               (when (and (listp expr)
-                          (memq (car expr) '(defcustom defface defgroup)))
-                 (eval expr)
-                 (put (nth 1 expr) 'custom-where name)))))
-       (error nil))
-      (kill-buffer (current-buffer))))
+       (all-subdirs command-line-args-left)
+       (start-directory default-directory))
+    (get-buffer-create " cus-dep temp")
+    (set-buffer " cus-dep temp")
+    (while all-subdirs
+      (message "Directory %s" (car all-subdirs))
+      (let ((files (directory-files (car all-subdirs) nil "\\`[^=].*\\.el\\'"))
+           (default-directory default-directory)
+           file)
+       (cd (car all-subdirs))
+       (while files
+         (setq file (car files)
+               files (cdr files))
+         (when (file-exists-p file)
+           (erase-buffer)
+           (insert-file-contents file)
+           (goto-char (point-min))
+           (string-match "\\`\\(.*\\)\\.el\\'" file)
+           (let ((name (file-name-nondirectory (match-string 1 file))))
+             (condition-case nil
+                 (while (re-search-forward "^(defcustom\\|^(defface\\|^(defgroup"
+                                           nil t)
+                   (beginning-of-line)
+                   (let ((expr (read (current-buffer))))
+                     (eval expr)
+                     (put (nth 1 expr) 'custom-where name)))
+               (error nil)))))
+       (setq all-subdirs (cdr all-subdirs)))))
   (message "Generating cus-load.el...")
   (find-file "cus-load.el")
   (erase-buffer)
@@ -42,6 +67,7 @@ Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies"
 ;;; cus-load.el --- automatically extracted custom dependencies
 ;;
 ;;; Code:
+
 ")
   (mapatoms (lambda (symbol)
              (let ((members (get symbol 'custom-group))
@@ -57,11 +83,18 @@ Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies"
                          (insert " ")
                        (insert "(put '" (symbol-name symbol) 
                                " 'custom-loads '("))
-                     (insert (prin1-to-string where))
+                     (prin1 where (current-buffer))
                      (push where found)))
-                 (insert "))\n")))))
-  (insert "\n;;; cus-load.el ends here\n")
-  (save-buffer)
-  (message "Generating cus-load.el..."))
+                 (when found
+                   (insert "))\n"))))))
+  (insert "\
+
+\(provide 'cus-load)
+
+;;; cus-load.el ends here\n")
+  (let ((kept-new-versions 10000000))
+    (save-buffer))
+  (message "Generating cus-load.el...done")
+  (kill-emacs))
 
 ;;; cus-dep.el ends here