comparison lisp/custom.el @ 5420:b9167d522a9a

Rebase with 21.5 trunk.
author Mats Lidell <matsl@xemacs.org>
date Thu, 28 Oct 2010 23:53:24 +0200
parents 308d34e9f07d d27c1ee1943b
children ac37a5f7e5be
comparison
equal deleted inserted replaced
5419:eaf01113cd42 5420:b9167d522a9a
40 ;; loading, all provides (and fsets) will be undone. put it first to 40 ;; loading, all provides (and fsets) will be undone. put it first to
41 ;; prevent require/provide loop with custom and cus-face. 41 ;; prevent require/provide loop with custom and cus-face.
42 (provide 'custom) 42 (provide 'custom)
43 43
44 (eval-when-compile 44 (eval-when-compile
45 (load "cl-macs" nil t)
46 ;; To elude warnings. 45 ;; To elude warnings.
47 (require 'cus-face)) 46 (require 'cus-face))
48 47
49 (autoload 'custom-declare-face "cus-face") 48 (autoload 'custom-declare-face "cus-face")
50 (autoload 'defun* "cl-macs")
51 49
52 (require 'widget) 50 (require 'widget)
53 51
54 (defvar custom-define-hook nil 52 (defvar custom-define-hook nil
55 ;; Customize information for this option is in `cus-edit.el'. 53 ;; Customize information for this option is in `cus-edit.el'.
1052 This means reset VARIABLE to its value in TO-THEME." 1050 This means reset VARIABLE to its value in TO-THEME."
1053 (apply 'custom-theme-reset-variables 'user args)) 1051 (apply 'custom-theme-reset-variables 'user args))
1054 1052
1055 ;;; The End. 1053 ;;; The End.
1056 1054
1057 ;; Process the defcustoms for variables loaded before this file. 1055 ;; XEmacs; we order preloaded-file-list such that there's no need for
1058 ;; `custom-declare-variable-list' is defvar'd in subr.el. Utility programs 1056 ;; custom-declare-variable-list.
1059 ;; run from temacs that do not load subr.el should defvar it themselves.
1060 ;; (As of 21.5.11, make-docfile.el.)
1061 (while custom-declare-variable-list
1062 (apply 'custom-declare-variable (car custom-declare-variable-list))
1063 (setq custom-declare-variable-list (cdr custom-declare-variable-list)))
1064 1057
1065 ;; custom.el ends here 1058 ;; custom.el ends here