Add a provide statement.

[gnu-emacs] / lisp / cus-dep.el

diff --git a/lisp/cus-dep.el b/lisp/cus-dep.el
index aeec07ae4f088e094d49d432eb616c207a7d918d..bd9fd71b57995e82cb9d3bdb21aa42a862d15479 100644 (file)
--- a/lisp/cus-dep.el
+++ b/lisp/cus-dep.el
@@ -92,7 +92,7 @@ Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS"
                (when members
                  ;; So x and no-x builds won't differ.
                  (setq members
-                       (sort (copy-sequence members) 
+                       (sort (copy-sequence members)
                              (lambda (x y) (string< (car x) (car y)))))
                  (while members
                    (setq item (car (car members))
@@ -102,7 +102,7 @@ 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)))
@@ -110,17 +110,17 @@ Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS"
                    (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 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.
+;;; information so `customize-changed-options' could do its job.
 
-;;; `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.
+;;; 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.
 
+;;; `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
@@ -136,34 +136,40 @@ Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS"
     (mapatoms (lambda (symbol)
                (let ((version (get symbol 'custom-version))
                      where)
-                 (when version 
+                 (when version
                    (setq where (get symbol 'custom-where))
                    (when where
-                     (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
+                     (if (or (custom-variable-p symbol)
+                             (custom-facep symbol))
+                         ;; This means it's a variable or a face.
                          (progn
-                           (insert " 'standard-value t)\n")
                            (if (assoc version version-alist)
-                               (unless 
-                                   (member where 
+                               (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")))))))
+                       (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"))
+                       ))))))
 
     (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
@@ -181,4 +187,6 @@ Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS"
   (kill-emacs))
 
 \f
+
+;;; arch-tag: b7b6421a-bf7a-44fd-a382-6f44976bdf68
 ;;; cus-dep.el ends here