]> code.delx.au - gnu-emacs/blobdiff - lisp/cus-dep.el
Fix typo.
[gnu-emacs] / lisp / cus-dep.el
index a733da89d79ab319e685a7febd785735d4209865..4cb856cc04452ae8c2d3c6df1785bc26425e4bc8 100644 (file)
@@ -1,4 +1,4 @@
-;;; cus-dep.el --- Find customization dependencies.
+;;; cus-dep.el --- find customization dependencies
 ;;
 ;; Copyright (C) 1997 Free Software Foundation, Inc.
 ;;
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
 ;;; Code:
 
-(require 'cl)
+(eval-when-compile (require 'cl))
 (require 'widget)
 (require 'cus-face)
+(require 'autoload)
 
 (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)
-       all-subdirs pending
+       (all-subdirs command-line-args-left)
        (start-directory default-directory))
     (get-buffer-create " cus-dep temp")
     (set-buffer " cus-dep temp")
-    (setq pending '("."))
-    (while pending
-      (let ((this (car pending))
-           this-subdirs
-           default-directory)
-       (setq all-subdirs (cons this all-subdirs))
-       (setq pending (cdr pending))
-       (setq default-directory
-             (expand-file-name this start-directory))
-       (message "Finding subdirs of %s" this)
-       (erase-buffer)
-       (condition-case nil
-           (progn
-             (insert-file-contents "subdirs.el")
-             (goto-char (point-min))
-             (search-forward "'(")
-             (forward-char -1)
-             (setq this-subdirs (read (current-buffer)))
-             (setq pending (nconc pending
-                                  (mapcar 
-                                   (function (lambda (dir)
-                                               (file-relative-name
-                                                (file-name-as-directory
-                                                 (expand-file-name dir this))
-                                                start-directory)))
-                                   this-subdirs))))
-         (error nil))))
-
     (while all-subdirs
       (message "Directory %s" (car all-subdirs))
       (let ((files (directory-files (car all-subdirs) nil "\\`[^=].*\\.el\\'"))
            (default-directory default-directory)
-           file)
+           file
+           is-autoloaded)
        (cd (car all-subdirs))
        (while files
          (setq file (car files)
                files (cdr files))
-         (message "Checking %s..." 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))))
+         (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)
+                   (setq is-autoloaded nil)
+                   (beginning-of-line)
+                   (save-excursion
+                     (forward-line -1)
+                     (if (looking-at generate-autoload-cookie)
+                         (setq is-autoloaded t)))
+                   (let ((expr (read (current-buffer))))
+                     (condition-case nil
+                         (progn
+                           (eval expr)
+                           (put (nth 1 expr) 'custom-autoloaded is-autoloaded)
+                           (put (nth 1 expr) 'custom-where name))
+                       (error nil))))
+               (error nil)))))
        (setq all-subdirs (cdr all-subdirs)))))
   (message "Generating cus-load.el...")
   (find-file "cus-load.el")
@@ -116,12 +101,79 @@ Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies"
                  (when found
                    (insert "))\n"))))))
   (insert "\
+;;; These are for handling :version.  We need to have a minimum of
+;;; information so `custom-changed-variables' could do its job.  
+;;; For both groups and variables we have to set `custom-version'.
+;;; For variables we also set the `standard-value' and for groups
+;;; `group-documentation' (which is shown in the customize buffer), so
+;;; we don't have to load the file containing the group.
+
+;;; `custom-versions-load-alist' is an alist that has as car a version
+;;; number and as elts the files that have variables that contain that
+;;; version. These files should be loaded before showing the
+;;; customization buffer that `customize-changed-options' generates.
+
+
+;;; This macro is used so we don't modify the information about
+;;; variables and groups if it's already set. (We don't know when
+;;; cus-load.el is going to be loaded and at that time some of the
+;;; files might be loaded and some others might not).
+\(defmacro custom-put-if-not (symbol propname value)
+  `(unless (get ,symbol ,propname)
+     (put ,symbol ,propname ,value)))
+
+")
+  (let ((version-alist nil))
+    (mapatoms (lambda (symbol)
+               (let ((version (get symbol 'custom-version))
+                     where)
+                 (when version 
+                   (setq where (get symbol 'custom-where))
+                   (when (and where 
+                              ;; Don't bother to do anything if it's
+                              ;; autoloaded because we will have all
+                              ;; this info when emacs is running
+                              ;; anyway.
+                              (not (get symbol 'custom-autoloaded)))
+                     (insert "(custom-put-if-not '" (symbol-name symbol) 
+                             " 'custom-version ")
+                     (prin1 version (current-buffer))
+                     (insert ")\n")
+                     (insert "(custom-put-if-not '" (symbol-name symbol))
+                     (if (get symbol 'standard-value)
+                         ;; This means it's a variable
+                         (progn
+                           (insert " 'standard-value t)\n")
+                           (if (assoc version version-alist)
+                               (unless 
+                                   (member where 
+                                           (cdr (assoc version version-alist)))
+                                 (push where (cdr (assoc version version-alist))))
+                             (push (cons version (list where)) version-alist)))
+                       ;; This is a group
+                       (insert " 'group-documentation ")
+                       (prin1 (get symbol 'group-documentation) (current-buffer))
+                       (insert ")\n")))))))
+
+    (insert "\n(defvar custom-versions-load-alist "
+           (if version-alist "'" ""))
+    (prin1 version-alist (current-buffer))
+    (insert "\n \"For internal use by custom.\")\n"))
+    
+  (insert "\
 
 \(provide 'cus-load)
 
+;;; Local Variables:
+;;; version-control: never
+;;; no-byte-compile: t
+;;; no-update-autoloads: t
+;;; End:
 ;;; cus-load.el ends here\n")
   (let ((kept-new-versions 10000000))
     (save-buffer))
-  (message "Generating cus-load.el...done"))
+  (message "Generating cus-load.el...done")
+  (kill-emacs))
 
+\f
 ;;; cus-dep.el ends here