X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/d568081554d6fad2611a2b7bb88cc02b6edbf53e..6a6d7c3403e416a82705544e2d80eaf83f1b390e:/lisp/cus-dep.el diff --git a/lisp/cus-dep.el b/lisp/cus-dep.el index 67b1f8b396..bd9fd71b57 100644 --- 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,7 +136,7 @@ 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 (if (or (custom-variable-p symbol) @@ -144,13 +144,13 @@ Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS" ;; This means it's a variable or a face. (progn (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) + (insert "(custom-put-if-not '" (symbol-name symbol) " 'custom-version ") (prin1 version (current-buffer)) (insert ")\n") @@ -169,7 +169,7 @@ Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS" (if version-alist "'" "")) (prin1 version-alist (current-buffer)) (insert "\n \"For internal use by custom.\")\n")) - + (insert "\ \(provide '" (file-name-sans-extension @@ -187,4 +187,6 @@ Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS" (kill-emacs)) + +;;; arch-tag: b7b6421a-bf7a-44fd-a382-6f44976bdf68 ;;; cus-dep.el ends here