*** empty log message ***

1 files changed, 69 insertions, 1 deletions

diff --git a/lisp/cus-dep.el b/lisp/cus-dep.el
index 006197aa3a..7674599b70 100644
--- a/lisp/cus-dep.el
+++ b/lisp/cus-dep.el
@@ -27,6 +27,7 @@
 (require 'cl)
 (require 'widget)
 (require 'cus-face)
+(require 'autoload)
 
 (defun custom-make-dependencies ()
   "Batch function to extract custom dependencies from .el files.
@@ -40,7 +41,8 @@ Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS"
       (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)
@@ -54,11 +56,17 @@ Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS"
 	      (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)))))
@@ -91,6 +99,66 @@ Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS"
 		  (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 "(put '" (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)