X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/f36742476a4584081cd580d8faaad3783ead105c..713fbb79dbd0e3e7e6933f95624f4b98df43eff5:/lisp/cus-dep.el

diff --git a/lisp/cus-dep.el b/lisp/cus-dep.el
index 286d4830fa..61c597a200 100644
--- a/lisp/cus-dep.el
+++ b/lisp/cus-dep.el
@@ -1,6 +1,6 @@
-;;; cus-dep.el --- Find customization dependencies.
+;;; cus-dep.el --- find customization dependencies
 ;;
-;; Copyright (C) 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: internal
@@ -19,52 +19,69 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
 
 ;;; Code:
 
-(require 'cl)
+(eval-when-compile (require 'cl))
 (require 'widget)
 (require 'cus-face)
 
+(defvar generated-custom-dependencies-file "cus-load.el"
+  "File \\[cusom-make-dependencies] puts custom dependencies into.")
+
 (defun custom-make-dependencies ()
   "Batch function to extract custom dependencies from .el files.
 Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS"
-  (let ((enable-local-eval nil)
-	(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)
+  (let ((enable-local-eval nil))
+    (set-buffer (get-buffer-create " cus-dep temp"))
+    (dolist (subdir command-line-args-left)
+      (message "Directory %s" subdir)
+      (let ((files (directory-files subdir nil "\\`[^=].*\\.el\\'"))
+	    (default-directory (expand-file-name subdir))
+	    (preloaded (concat "\\`"
+			       (regexp-opt (mapcar
+					    (lambda (f)
+					      (file-name-sans-extension
+					       (file-name-nondirectory f)))
+					    preloaded-file-list) t)
+			       "\\.el\\'")))
+	(dolist (file files)
+	  (when (and (file-exists-p file)
+		     ;; Ignore files that are preloaded.
+		     (not (string-match preloaded file)))
 	    (erase-buffer)
 	    (insert-file-contents file)
 	    (goto-char (point-min))
 	    (string-match "\\`\\(.*\\)\\.el\\'" file)
-	    (let ((name (file-name-nondirectory (match-string 1 file))))
+	    (let ((name (file-name-nondirectory (match-string 1 file)))
+		  (load-file-name file))
+	      (if (save-excursion
+		    (re-search-forward
+		     (concat "(provide[ \t\n]+\\('\\|(quote[ \t\n]\\)[ \t\n]*"
+			     (regexp-quote name) "[ \t\n)]")
+		     nil t))
+		  (setq name (intern name)))
 	      (condition-case nil
-		  (while (re-search-forward "^(defcustom\\|^(defface\\|^(defgroup"
-					    nil t)
+		  (while (re-search-forward
+			  "^(def\\(custom\\|face\\|group\\)" 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")
+		      (condition-case nil
+			  (let ((custom-dont-initialize t))
+			    (eval expr)
+			    (put (nth 1 expr) 'custom-where name))
+			(error nil))))
+		(error nil))))))))
+  (message "Generating %s..." generated-custom-dependencies-file)
+  (set-buffer (find-file-noselect generated-custom-dependencies-file))
   (erase-buffer)
   (insert "\
-;;; cus-load.el --- automatically extracted custom dependencies
+;;; " (file-name-nondirectory generated-custom-dependencies-file)
+      " --- automatically extracted custom dependencies
 ;;
 ;;; Code:
 
@@ -73,6 +90,10 @@ Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS"
 	      (let ((members (get symbol 'custom-group))
 		    item where found)
 		(when members
+		  ;; So x and no-x builds won't differ.
+		  (setq members
+			(sort (copy-sequence members)
+			      (lambda (x y) (string< (car x) (car y)))))
 		  (while members
 		    (setq item (car (car members))
 			  members (cdr members)
@@ -81,20 +102,91 @@ Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS"
 				(member where found))
 		      (if found
 			  (insert " ")
-			(insert "(put '" (symbol-name symbol) 
+			(insert "(put '" (symbol-name symbol)
 				" 'custom-loads '("))
 		      (prin1 where (current-buffer))
 		      (push where found)))
 		  (when found
 		    (insert "))\n"))))))
   (insert "\
+;;; These are for handling :version.  We need to have a minimum of
+;;; information so `customize-changed-options' could do its job.
+
+;;; For groups we set `custom-version', `group-documentation' and
+;;; `custom-tag' (which are shown in the customize buffer), so we
+;;; don't have to load the file containing the group.
 
-\(provide 'cus-load)
+;;; `custom-versions-load-alist' is an alist that has as car a version
+;;; number and as elts the files that have variables or faces 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
+;;; " (file-name-nondirectory generated-custom-dependencies-file)
+      " 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 where
+		      (if (or (custom-variable-p symbol)
+			      (custom-facep symbol))
+			  ;; This means it's a variable or a face.
+			  (progn
+			    (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 "(custom-put-if-not '" (symbol-name symbol)
+				" 'custom-version ")
+			(prin1 version (current-buffer))
+			(insert ")\n")
+			(insert "(custom-put-if-not '" (symbol-name symbol))
+			(insert " 'group-documentation ")
+			(prin1 (get symbol 'group-documentation) (current-buffer))
+			(insert ")\n")
+			(when (get symbol 'custom-tag)
+			  (insert "(custom-put-if-not '" (symbol-name symbol))
+			  (insert " 'custom-tag ")
+			  (prin1 (get symbol 'custom-tag) (current-buffer))
+			  (insert ")\n"))
+			))))))
 
-;;; cus-load.el ends here\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 '" (file-name-sans-extension
+	      (file-name-nondirectory generated-custom-dependencies-file)) ")
+
+;;; Local Variables:
+;;; version-control: never
+;;; no-byte-compile: t
+;;; no-update-autoloads: t
+;;; End:
+;;; " (file-name-nondirectory generated-custom-dependencies-file) " ends here\n")
   (let ((kept-new-versions 10000000))
     (save-buffer))
-  (message "Generating cus-load.el...done")
+  (message "Generating %s...done" generated-custom-dependencies-file)
   (kill-emacs))
 
+
+
+;;; arch-tag: b7b6421a-bf7a-44fd-a382-6f44976bdf68
 ;;; cus-dep.el ends here