(normal-splash-screen, fancy-splash-screens-1): Add a reference to the Lisp

[gnu-emacs] / lisp / custom.el

diff --git a/lisp/custom.el b/lisp/custom.el
index 9f68eb59e39f49f440d87b403877a80bfbcb7be7..2ac1e23ac493735bdcf77299e4c8d766fb5dd465 100644 (file)
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -1,6 +1,7 @@
 ;;; custom.el --- tools for declaring and initializing options
 ;;
 ;;; custom.el --- tools for declaring and initializing options
 ;;

-;; Copyright (C) 1996, 1997, 1999, 2001, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1999, 2001, 2002, 2003, 2004,
+;;   2005, 2006 Free Software Foundation, Inc.

 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Maintainer: FSF
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Maintainer: FSF


@@ -20,16 +21,16 @@
 
 ;; 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
 
 ;; 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:
 ;;
 
 ;;; Commentary:
 ;;

-;; This file only contain the code needed to declare and initialize
+;; This file only contains the code needed to declare and initialize

 ;; user options.  The code to customize options is autoloaded from
 ;; `cus-edit.el' and is documented in the Emacs Lisp Reference manual.
 
 ;; user options.  The code to customize options is autoloaded from
 ;; `cus-edit.el' and is documented in the Emacs Lisp Reference manual.
 

-;; The code implementing face declarations is in `cus-face.el'
+;; The code implementing face declarations is in `cus-face.el'.

 
 ;;; Code:
 
 
 ;;; Code:
 


@@ -39,6 +40,11 @@
   ;; Customize information for this option is in `cus-edit.el'.
   "Hook called after defining each customize option.")
 
   ;; Customize information for this option is in `cus-edit.el'.
   "Hook called after defining each customize option.")
 

+(defvar custom-dont-initialize nil
+  "Non-nil means `defcustom' should not initialize the variable.
+That is used for the sake of `custom-make-dependencies'.
+Users should not set it.")
+

 (defvar custom-current-group-alist nil
   "Alist of (FILE . GROUP) indicating the current group to use for FILE.")
 
 (defvar custom-current-group-alist nil
   "Alist of (FILE . GROUP) indicating the current group to use for FILE.")
 


@@ -48,7 +54,7 @@
   "Initialize SYMBOL with VALUE.
 This will do nothing if symbol already has a default binding.
 Otherwise, if symbol has a `saved-value' property, it will evaluate
   "Initialize SYMBOL with VALUE.
 This will do nothing if symbol already has a default binding.
 Otherwise, if symbol has a `saved-value' property, it will evaluate

-the car of that and used as the default binding for symbol.
+the car of that and use it as the default binding for symbol.

 Otherwise, VALUE will be evaluated and used as the default binding for
 symbol."
   (unless (default-boundp symbol)
 Otherwise, VALUE will be evaluated and used as the default binding for
 symbol."
   (unless (default-boundp symbol)


@@ -70,6 +76,28 @@ if any, or VALUE."
                 (eval (car (get symbol 'saved-value)))
               (eval value)))))
 
                 (eval (car (get symbol 'saved-value)))
               (eval value)))))
 

+(defun custom-initialize-safe-set (symbol value)
+  "Like `custom-initialize-set', but catches errors.
+If an error occurs during initialization, SYMBOL is set to nil
+and no error is thrown.  This is meant for use in pre-loaded files
+where some variables or functions used to compute VALUE may not yet
+be defined.  You can then re-evaluate VALUE in startup.el, for instance
+using `custom-reevaluate-setting'."
+  (condition-case nil
+      (custom-initialize-set symbol value)
+    (error (set-default symbol nil))))
+
+(defun custom-initialize-safe-default (symbol value)
+  "Like `custom-initialize-default', but catches errors.
+If an error occurs during initialization, SYMBOL is set to nil
+and no error is thrown.  This is meant for use in pre-loaded files
+where some variables or functions used to compute VALUE may not yet
+be defined.  You can then re-evaluate VALUE in startup.el, for instance
+using `custom-reevaluate-setting'."
+  (condition-case nil
+      (custom-initialize-default symbol value)
+    (error (set-default symbol nil))))
+

 (defun custom-initialize-reset (symbol value)
   "Initialize SYMBOL based on VALUE.
 Set the symbol, using its `:set' function (or `set-default' if it has none).
 (defun custom-initialize-reset (symbol value)
   "Initialize SYMBOL based on VALUE.
 Set the symbol, using its `:set' function (or `set-default' if it has none).


@@ -107,8 +135,11 @@ For the standard setting, use `set-default'."
 (defun custom-declare-variable (symbol default doc &rest args)
   "Like `defcustom', but SYMBOL and DEFAULT are evaluated as normal arguments.
 DEFAULT should be an expression to evaluate to compute the default value,
 (defun custom-declare-variable (symbol default doc &rest args)
   "Like `defcustom', but SYMBOL and DEFAULT are evaluated as normal arguments.
 DEFAULT should be an expression to evaluate to compute the default value,

-not the default value itself."
-  ;; Remember the standard setting.
+not the default value itself.
+
+DEFAULT is stored as SYMBOL's standard value, in SYMBOL's property
+`standard-value'.  At the same time, SYMBOL's property `force-value' is
+set to nil, as the value is no longer rogue."

   (put symbol 'standard-value (list default))
   ;; Maybe this option was rogue in an earlier version.  It no longer is.
   (when (get symbol 'force-value)
   (put symbol 'standard-value (list default))
   ;; Maybe this option was rogue in an earlier version.  It no longer is.
   (when (get symbol 'force-value)


@@ -136,7 +167,7 @@ not the default value itself."
                ((eq keyword :get)
                 (put symbol 'custom-get value))
                ((eq keyword :require)
                ((eq keyword :get)
                 (put symbol 'custom-get value))
                ((eq keyword :require)

-                (setq requests (cons value requests)))
+                (push value requests))

                ((eq keyword :type)
                 (put symbol 'custom-type (purecopy value)))
                ((eq keyword :options)
                ((eq keyword :type)
                 (put symbol 'custom-type (purecopy value)))
                ((eq keyword :options)


@@ -144,7 +175,7 @@ not the default value itself."
                     ;; Slow safe code to avoid duplicates.
                     (mapc (lambda (option)
                             (custom-add-option symbol option))
                     ;; Slow safe code to avoid duplicates.
                     (mapc (lambda (option)
                             (custom-add-option symbol option))

-                            value)
+                          value)

                   ;; Fast code for the common case.
                   (put symbol 'custom-options (copy-sequence value))))
                (t
                   ;; Fast code for the common case.
                   (put symbol 'custom-options (copy-sequence value))))
                (t


@@ -152,8 +183,9 @@ not the default value itself."
                                        'custom-variable))))))
     (put symbol 'custom-requests requests)
     ;; Do the actual initialization.
                                        'custom-variable))))))
     (put symbol 'custom-requests requests)
     ;; Do the actual initialization.

-    (funcall initialize symbol default))
-  (setq current-load-list (cons symbol current-load-list))
+    (unless custom-dont-initialize
+      (funcall initialize symbol default)))
+  (push symbol current-load-list)

   (run-hooks 'custom-define-hook)
   symbol)
 
   (run-hooks 'custom-define-hook)
   symbol)
 


@@ -161,7 +193,7 @@ not the default value itself."
   "Declare SYMBOL as a customizable variable that defaults to VALUE.
 DOC is the variable documentation.
 
   "Declare SYMBOL as a customizable variable that defaults to VALUE.
 DOC is the variable documentation.
 

-Neither SYMBOL nor VALUE needs to be quoted.
+Neither SYMBOL nor VALUE need to be quoted.

 If SYMBOL is not already bound, initialize it to VALUE.
 The remaining arguments should have the form
 
 If SYMBOL is not already bound, initialize it to VALUE.
 The remaining arguments should have the form
 


@@ -169,70 +201,106 @@ The remaining arguments should have the form
 
 The following keywords are meaningful:
 
 
 The following keywords are meaningful:
 

-:type  VALUE should be a widget type for editing the symbols value.
+:type  VALUE should be a widget type for editing the symbol's value.

 :options VALUE should be a list of valid members of the widget type.
 :options VALUE should be a list of valid members of the widget type.

+:initialize
+       VALUE should be a function used to initialize the
+       variable.  It takes two arguments, the symbol and value
+       given in the `defcustom' call.  The default is
+       `custom-initialize-reset'.
+:set   VALUE should be a function to set the value of the symbol.
+       It takes two arguments, the symbol to set and the value to
+       give it.  The default choice of function is `custom-set-default'.
+:get   VALUE should be a function to extract the value of symbol.
+       The function takes one argument, a symbol, and should return
+       the current value for that symbol.  The default choice of function
+       is `custom-default-value'.
+:require
+       VALUE should be a feature symbol.  If you save a value
+       for this option, then when your `.emacs' file loads the value,
+       it does (require VALUE) first.
+
+The following common keywords are also meaningful.
+

 :group  VALUE should be a customization group.
 :group  VALUE should be a customization group.

-        Add SYMBOL to that group.
+        Add SYMBOL (or FACE with `defface') to that group.

 :link LINK-DATA
         Include an external link after the documentation string for this
         item.  This is a sentence containing an active field which
         references some other documentation.
 :link LINK-DATA
         Include an external link after the documentation string for this
         item.  This is a sentence containing an active field which
         references some other documentation.

-   
-        There are three alternatives you can use for LINK-DATA:
-   
+
+        There are several alternatives you can use for LINK-DATA:
+

         (custom-manual INFO-NODE)
              Link to an Info node; INFO-NODE is a string which specifies
         (custom-manual INFO-NODE)
              Link to an Info node; INFO-NODE is a string which specifies

-             the node name, as in \"(emacs)Top\".  The link appears as
-             `[manual]' in the customization buffer.
-   
+             the node name, as in \"(emacs)Top\".
+

         (info-link INFO-NODE)
              Like `custom-manual' except that the link appears in the
              customization buffer with the Info node name.
         (info-link INFO-NODE)
              Like `custom-manual' except that the link appears in the
              customization buffer with the Info node name.

-   
+

         (url-link URL)
              Link to a web page; URL is a string which specifies the URL.
         (url-link URL)
              Link to a web page; URL is a string which specifies the URL.

-             The link appears in the customization buffer as URL.
-   
+
+        (emacs-commentary-link LIBRARY)
+             Link to the commentary section of LIBRARY.
+
+        (emacs-library-link LIBRARY)
+             Link to an Emacs Lisp LIBRARY file.
+
+        (file-link FILE)
+             Link to FILE.
+
+        (function-link FUNCTION)
+             Link to the documentation of FUNCTION.
+
+        (variable-link VARIABLE)
+             Link to the documentation of VARIABLE.
+
+        (custom-group-link GROUP)
+             Link to another customization GROUP.
+

         You can specify the text to use in the customization buffer by
         adding `:tag NAME' after the first element of the LINK-DATA; for
         example, (info-link :tag \"foo\" \"(emacs)Top\") makes a link to the
         Emacs manual which appears in the buffer as `foo'.
         You can specify the text to use in the customization buffer by
         adding `:tag NAME' after the first element of the LINK-DATA; for
         example, (info-link :tag \"foo\" \"(emacs)Top\") makes a link to the
         Emacs manual which appears in the buffer as `foo'.

-   
+

         An item can have more than one external link; however, most items
         have none at all.
         An item can have more than one external link; however, most items
         have none at all.

-:initialize
-       VALUE should be a function used to initialize the
-       variable.  It takes two arguments, the symbol and value
-       given in the `defcustom' call.  The default is
-       `custom-initialize-reset'.
-:set   VALUE should be a function to set the value of the symbol.
-       It takes two arguments, the symbol to set and the value to
-       give it.  The default choice of function is `custom-set-default'.
-:get   VALUE should be a function to extract the value of symbol.
-       The function takes one argument, a symbol, and should return
-       the current value for that symbol.  The default choice of function
-       is `custom-default-value'.
-:require
-       VALUE should be a feature symbol.  If you save a value
-       for this option, then when your `.emacs' file loads the value,
-       it does (require VALUE) first.

 :version
         VALUE should be a string specifying that the variable was
         first introduced, or its default value was changed, in Emacs
         version VERSION.
 :version
         VALUE should be a string specifying that the variable was
         first introduced, or its default value was changed, in Emacs
         version VERSION.

+:package-version
+        VALUE should be a list with the form (PACKAGE . VERSION)
+        specifying that the variable was first introduced, or its
+        default value was changed, in PACKAGE version VERSION.  This
+        keyword takes priority over :version.  The PACKAGE and VERSION
+        must appear in the alist `customize-package-emacs-version-alist'.
+        Since PACKAGE must be unique and the user might see it in an
+        error message, a good choice is the official name of the
+        package, such as MH-E or Gnus.

 :tag LABEL
         Use LABEL, a string, instead of the item's name, to label the item
         in customization menus and buffers.
 :load FILE
         Load file FILE (a string) before displaying this customization
 :tag LABEL
         Use LABEL, a string, instead of the item's name, to label the item
         in customization menus and buffers.
 :load FILE
         Load file FILE (a string) before displaying this customization

-        item.  Loading is done with `load-library', and only if the file is
+        item.  Loading is done with `load', and only if the file is

         not already loaded.
         not already loaded.

-:set-after VARIABLE
-       Specifies that SYMBOL should be set after VARIABLE when
-       both have been customized.
-
-Read the section about customization in the Emacs Lisp manual for more
-information."
+:set-after VARIABLES
+       Specifies that SYMBOL should be set after the list of variables
+        VARIABLES when both have been customized.
+
+If SYMBOL has a local binding, then this form affects the local
+binding.  This is normally not what you want.  Thus, if you need
+to load a file defining variables with this form, or with
+`defvar' or `defconst', you should always load that file
+_outside_ any bindings for these variables.  \(`defvar' and
+`defconst' behave similarly in this respect.)
+
+See Info node `(elisp) Customization' in the Emacs Lisp manual
+for more information."
+  (declare (doc-string 3))

   ;; It is better not to use backquote in this file,
   ;; because that makes a bootstrapping problem
   ;; if you need to recompile all the Lisp files using interpreted code.
   ;; It is better not to use backquote in this file,
   ;; because that makes a bootstrapping problem
   ;; if you need to recompile all the Lisp files using interpreted code.


@@ -250,7 +318,7 @@ FACE does not need to be quoted.
 
 Third argument DOC is the face documentation.
 
 
 Third argument DOC is the face documentation.
 

-If FACE has been set with `custom-set-face', set the face attributes
+If FACE has been set with `custom-set-faces', set the face attributes

 as specified by that function, otherwise set the face attributes
 according to SPEC.
 
 as specified by that function, otherwise set the face attributes
 according to SPEC.
 


@@ -258,16 +326,23 @@ The remaining arguments should have the form
 
    [KEYWORD VALUE]...
 
 
    [KEYWORD VALUE]...
 

-The following KEYWORDs are defined:
-
-:group  VALUE should be a customization group.
-        Add FACE to that group.
+For a list of valid keywords, see the common keywords listed in
+`defcustom'.

 
 SPEC should be an alist of the form ((DISPLAY ATTS)...).
 
 
 SPEC should be an alist of the form ((DISPLAY ATTS)...).
 

-The first element of SPEC where the DISPLAY matches the frame
-is the one that takes effect in that frame.  The ATTRs in this
-element take effect; the other elements are ignored, on that frame.
+In the first element, DISPLAY can be :default.  The ATTS in that
+element then act as defaults for all the following elements.
+
+Aside from that, DISPLAY specifies conditions to match some or
+all frames.  For each frame, the first element of SPEC where the
+DISPLAY conditions are satisfied is the one that applies to that
+frame.  The ATTRs in this element take effect, and the following
+elements are ignored, on that frame.
+
+In the last element, DISPLAY can be t.  That element applies to a
+frame if none of the previous elements (except the :default if
+any) did.

 
 ATTS is a list of face attributes followed by their values:
   (ATTR VALUE ATTR VALUE...)
 
 ATTS is a list of face attributes followed by their values:
   (ATTR VALUE ATTR VALUE...)


@@ -276,15 +351,17 @@ The possible attributes are `:family', `:width', `:height', `:weight',
 `:slant', `:underline', `:overline', `:strike-through', `:box',
 `:foreground', `:background', `:stipple', `:inverse-video', and `:inherit'.
 
 `:slant', `:underline', `:overline', `:strike-through', `:box',
 `:foreground', `:background', `:stipple', `:inverse-video', and `:inherit'.
 

-DISPLAY can either be the symbol t, which will match all frames, or an
-alist of the form \((REQ ITEM...)...).  For the DISPLAY to match a
-FRAME, the REQ property of the frame must match one of the ITEM.  The
-following REQ are defined:
+DISPLAY can be `:default' (only in the first element), the symbol
+t (only in the last element) to match all frames, or an alist of
+conditions of the form \(REQ ITEM...).  For such an alist to
+match a frame, each of the conditions must be satisfied, meaning
+that the REQ property of the frame must match one of the
+corresponding ITEMs.  These are the defined REQ values:

 
 `type' (the value of `window-system')
   Under X, in addition to the values `window-system' can take,
 
 `type' (the value of `window-system')
   Under X, in addition to the values `window-system' can take,

-  `motif', `lucid' and `x-toolkit' are allowed, and match when
-  the Motif toolkit, Lucid toolkit, or any X toolkit is in use.
+  `motif', `lucid', `gtk' and `x-toolkit' are allowed, and match when
+  the Motif toolkit, Lucid toolkit, GTK toolkit or any X toolkit is in use.

 
 `class' (the frame's color support)
   Should be one of `color', `grayscale', or `mono'.
 
 `class' (the frame's color support)
   Should be one of `color', `grayscale', or `mono'.


@@ -292,8 +369,18 @@ following REQ are defined:
 `background' (what color is used for the background text)
   Should be one of `light' or `dark'.
 
 `background' (what color is used for the background text)
   Should be one of `light' or `dark'.
 

-Read the section about customization in the Emacs Lisp manual for more
-information."
+`min-colors' (the minimum number of colors the frame should support)
+  Should be an integer, it is compared with the result of
+  `display-color-cells'.
+
+`supports' (only match frames that support the specified face attributes)
+  Should be a list of face attributes.  See the documentation for
+  the function `display-supports-face-attributes-p' for more
+  information on exactly how testing is done.
+
+See Info node `(elisp) Customization' in the Emacs Lisp manual
+for more information."
+  (declare (doc-string 3))

   ;; It is better not to use backquote in this file,
   ;; because that makes a bootstrapping problem
   ;; if you need to recompile all the Lisp files using interpreted code.
   ;; It is better not to use backquote in this file,
   ;; because that makes a bootstrapping problem
   ;; if you need to recompile all the Lisp files using interpreted code.


@@ -309,7 +396,6 @@ information."
   (while members
     (apply 'custom-add-to-group symbol (car members))
     (setq members (cdr members)))
   (while members
     (apply 'custom-add-to-group symbol (car members))
     (setq members (cdr members)))

-  (put symbol 'custom-group (nconc members (get symbol 'custom-group)))

   (when doc
     ;; This text doesn't get into DOC.
     (put symbol 'group-documentation (purecopy doc)))
   (when doc
     ;; This text doesn't get into DOC.
     (put symbol 'group-documentation (purecopy doc)))


@@ -350,16 +436,12 @@ The remaining arguments should have the form
 
    [KEYWORD VALUE]...
 
 
    [KEYWORD VALUE]...
 

-The following KEYWORDs are defined:
+For a list of valid keywords, see the common keywords listed in
+`defcustom'.

 
 

-:group   VALUE should be a customization group.
-         Add SYMBOL to that group.
-
-:version VALUE should be a string specifying that the group was introduced
-         in Emacs version VERSION.
-
-Read the section about customization in the Emacs Lisp manual for more
-information."
+See Info node `(elisp) Customization' in the Emacs Lisp manual
+for more information."
+  (declare (doc-string 3))

   ;; It is better not to use backquote in this file,
   ;; because that makes a bootstrapping problem
   ;; if you need to recompile all the Lisp files using interpreted code.
   ;; It is better not to use backquote in this file,
   ;; because that makes a bootstrapping problem
   ;; if you need to recompile all the Lisp files using interpreted code.


@@ -373,13 +455,24 @@ If there already is an entry for OPTION and WIDGET, nothing is done."
     (unless (member entry members)
       (put group 'custom-group (nconc members (list entry))))))
 
     (unless (member entry members)
       (put group 'custom-group (nconc members (list entry))))))
 

+(defun custom-group-of-mode (mode)
+  "Return the custom group corresponding to the major or minor MODE.
+If no such group is found, return nil."
+  (or (get mode 'custom-mode-group)
+      (if (or (get mode 'custom-group)
+             (and (string-match "-mode\\'" (symbol-name mode))
+                  (get (setq mode (intern (substring (symbol-name mode)
+                                                     0 (match-beginning 0))))
+                       'custom-group)))
+         mode)))
+

 ;;; Properties.
 
 (defun custom-handle-all-keywords (symbol args type)
   "For customization option SYMBOL, handle keyword arguments ARGS.
 Third argument TYPE is the custom option type."
   (unless (memq :group args)
 ;;; Properties.
 
 (defun custom-handle-all-keywords (symbol args type)
   "For customization option SYMBOL, handle keyword arguments ARGS.
 Third argument TYPE is the custom option type."
   (unless (memq :group args)

-    (custom-add-to-group (custom-current-group) symbol 'custom-face))
+    (custom-add-to-group (custom-current-group) symbol type))

   (while args
     (let ((arg (car args)))
       (setq args (cdr args))
   (while args
     (let ((arg (car args)))
       (setq args (cdr args))


@@ -401,6 +494,8 @@ Fourth argument TYPE is the custom option type."
         (custom-add-to-group value symbol type))
        ((eq keyword :version)
         (custom-add-version symbol value))
         (custom-add-to-group value symbol type))
        ((eq keyword :version)
         (custom-add-version symbol value))

+       ((eq keyword :package-version)
+        (custom-add-package-version symbol value))

        ((eq keyword :link)
         (custom-add-link symbol value))
        ((eq keyword :load)
        ((eq keyword :link)
         (custom-add-link symbol value))
        ((eq keyword :load)


@@ -430,12 +525,14 @@ both appear in constructs like `custom-set-variables'."
        (setq value (cdr value))))
     (unless (eq deps new-deps)
       (put symbol 'custom-dependencies new-deps))))
        (setq value (cdr value))))
     (unless (eq deps new-deps)
       (put symbol 'custom-dependencies new-deps))))

-  
+

 (defun custom-add-option (symbol option)
   "To the variable SYMBOL add OPTION.
 
 (defun custom-add-option (symbol option)
   "To the variable SYMBOL add OPTION.
 

-If SYMBOL is a hook variable, OPTION should be a hook member.
-For other types variables, the effect is undefined."
+If SYMBOL's custom type is a hook, OPTION should be a hook member.
+If SYMBOL's custom type is an alist, OPTION specifies a symbol
+to offer to the user as a possible key in the alist.
+For other custom types, this has no effect."

   (let ((options (get symbol 'custom-options)))
     (unless (member option options)
       (put symbol 'custom-options (cons option options)))))
   (let ((options (get symbol 'custom-options)))
     (unless (member option options)
       (put symbol 'custom-options (cons option options)))))


@@ -450,6 +547,10 @@ For other types variables, the effect is undefined."
   "To the custom option SYMBOL add the version VERSION."
   (put symbol 'custom-version (purecopy version)))
 
   "To the custom option SYMBOL add the version VERSION."
   (put symbol 'custom-version (purecopy version)))
 

+(defun custom-add-package-version (symbol version)
+  "To the custom option SYMBOL add the package version VERSION."
+  (put symbol 'custom-package-version (purecopy version)))
+

 (defun custom-add-load (symbol load)
   "To the custom option SYMBOL add the dependency LOAD.
 LOAD should be either a library file name, or a feature name."
 (defun custom-add-load (symbol load)
   "To the custom option SYMBOL add the dependency LOAD.
 LOAD should be either a library file name, or a feature name."


@@ -457,6 +558,19 @@ LOAD should be either a library file name, or a feature name."
     (unless (member load loads)
       (put symbol 'custom-loads (cons (purecopy load) loads)))))
 
     (unless (member load loads)
       (put symbol 'custom-loads (cons (purecopy load) loads)))))
 

+(defun custom-autoload (symbol load)
+  "Mark SYMBOL as autoloaded custom variable and add dependency LOAD."
+  (put symbol 'custom-autoload t)
+  (custom-add-load symbol load))
+
+;; This test is also in the C code of `user-variable-p'.
+(defun custom-variable-p (variable)
+  "Return non-nil if VARIABLE is a custom variable.
+This recursively follows aliases."
+  (setq variable (indirect-variable variable))
+  (or (get variable 'standard-value)
+      (get variable 'custom-autoload)))
+

 ;;; Loading files needed to customize a symbol.
 ;;; This is in custom.el because menu-bar.el needs it for toggle cmds.
 
 ;;; Loading files needed to customize a symbol.
 ;;; This is in custom.el because menu-bar.el needs it for toggle cmds.
 


@@ -466,41 +580,36 @@ LOAD should be either a library file name, or a feature name."
 (defun custom-load-symbol (symbol)
   "Load all dependencies for SYMBOL."
   (unless custom-load-recursion
 (defun custom-load-symbol (symbol)
   "Load all dependencies for SYMBOL."
   (unless custom-load-recursion

-    (let ((custom-load-recursion t)
-         (loads (get symbol 'custom-loads))
-         load)
-      (while loads
-       (setq load (car loads)
-             loads (cdr loads))
-       (cond ((symbolp load)
-              (condition-case nil
-                  (require load)
-                (error nil)))
-             ;; Don't reload a file already loaded.
-             ((and (boundp 'preloaded-file-list)
-                   (member load preloaded-file-list)))
+    (let ((custom-load-recursion t))
+      ;; Load these files if not already done,
+      ;; to make sure we know all the dependencies of SYMBOL.
+      (condition-case nil
+         (require 'cus-load)
+       (error nil))
+      (condition-case nil
+         (require 'cus-start)
+       (error nil))
+      (dolist (load (get symbol 'custom-loads))
+       (cond ((symbolp load) (condition-case nil (require load) (error nil)))
+             ;; This is subsumed by the test below, but it's much faster.

              ((assoc load load-history))
              ;; This was just (assoc (locate-library load) load-history)
              ;; but has been optimized not to load locate-library
              ;; if not necessary.
              ((assoc load load-history))
              ;; This was just (assoc (locate-library load) load-history)
              ;; but has been optimized not to load locate-library
              ;; if not necessary.

-             ((let (found (regexp (regexp-quote load)))
+             ((let ((regexp (concat "\\(\\`\\|/\\)" (regexp-quote load)
+                                    "\\(\\'\\|\\.\\)"))
+                    (found nil))

                 (dolist (loaded load-history)
                   (and (stringp (car loaded))
                        (string-match regexp (car loaded))
                 (dolist (loaded load-history)
                   (and (stringp (car loaded))
                        (string-match regexp (car loaded))

-                       (eq (locate-library load) (car loaded))

                        (setq found t)))
                 found))
              ;; Without this, we would load cus-edit recursively.
              ;; We are still loading it when we call this,
              ;; and it is not in load-history yet.
              ((equal load "cus-edit"))
                        (setq found t)))
                 found))
              ;; Without this, we would load cus-edit recursively.
              ;; We are still loading it when we call this,
              ;; and it is not in load-history yet.
              ((equal load "cus-edit"))

-             (t
-              (condition-case nil
-                  (load-library load)
-                (error nil))))))))
-
-;;; Initializing.
-
+             (t (condition-case nil (load load) (error nil))))))))
+\f

 (defvar custom-local-buffer nil
   "Non-nil, in a Customization buffer, means customize a specific buffer.
 If this variable is non-nil, it should be a buffer,
 (defvar custom-local-buffer nil
   "Non-nil, in a Customization buffer, means customize a specific buffer.
 If this variable is non-nil, it should be a buffer,


@@ -509,78 +618,6 @@ This variable is a permanent local, and it normally has a local binding
 in every Customization buffer.")
 (put 'custom-local-buffer 'permanent-local t)
 
 in every Customization buffer.")
 (put 'custom-local-buffer 'permanent-local t)
 

-(defun custom-set-variables (&rest args)
-  "Initialize variables according to user preferences.
-
-The arguments should be a list where each entry has the form:
-
-  (SYMBOL VALUE [NOW [REQUEST [COMMENT]]])
-
-The unevaluated VALUE is stored as the saved value for SYMBOL.
-If NOW is present and non-nil, VALUE is also evaluated and bound as
-the default value for the SYMBOL.
-REQUEST is a list of features we must require for SYMBOL.
-COMMENT is a comment string about SYMBOL."
-  (setq args
-       (sort args
-             (lambda (a1 a2)
-               (let* ((sym1 (car a1))
-                      (sym2 (car a2))
-                      (1-then-2 (memq sym1 (get sym2 'custom-dependencies)))
-                      (2-then-1 (memq sym2 (get sym1 'custom-dependencies))))
-                 (cond ((and 1-then-2 2-then-1)
-                        (error "Circular custom dependency between `%s' and `%s'"
-                               sym1 sym2))
-                       (1-then-2 t)
-                       (2-then-1 nil)
-                       ;; Put symbols with :require last.  The macro
-                       ;; define-minor-mode generates a defcustom
-                       ;; with a :require and a :set, where the
-                       ;; setter function calls the mode function.
-                       ;; Putting symbols with :require last ensures
-                       ;; that the mode function will see other
-                       ;; customized values rather than default
-                       ;; values.
-                       (t (nth 3 a2)))))))
-  (while args
-    (let ((entry (car args)))
-      (if (listp entry)
-         (let* ((symbol (nth 0 entry))
-                (value (nth 1 entry))
-                (now (nth 2 entry))
-                (requests (nth 3 entry))
-                (comment (nth 4 entry))
-                set)
-           (when requests
-             (put symbol 'custom-requests requests)
-             (mapc 'require requests))
-           (setq set (or (get symbol 'custom-set) 'custom-set-default))
-           (put symbol 'saved-value (list value))
-           (put symbol 'saved-variable-comment comment)
-           ;; Allow for errors in the case where the setter has
-           ;; changed between versions, say, but let the user know.
-           (condition-case data
-               (cond (now
-                      ;; Rogue variable, set it now.
-                      (put symbol 'force-value t)
-                      (funcall set symbol (eval value)))
-                     ((default-boundp symbol)
-                      ;; Something already set this, overwrite it.
-                      (funcall set symbol (eval value))))
-             (error 
-              (message "Error setting %s: %s" symbol data)))
-           (setq args (cdr args))
-           (and (or now (default-boundp symbol))
-                (put symbol 'variable-comment comment)))
-       ;; Old format, a plist of SYMBOL VALUE pairs.
-       (message "Warning: old format `custom-set-variables'")
-       (ding)
-       (sit-for 2)
-       (let ((symbol (nth 0 args))
-             (value (nth 1 args)))
-         (put symbol 'saved-value (list value)))
-       (setq args (cdr (cdr args)))))))
-

 (defun custom-set-default (variable value)
   "Default :set function for a customizable variable.
 Normally, this sets the default value of VARIABLE to VALUE,
 (defun custom-set-default (variable value)
   "Default :set function for a customizable variable.
 Normally, this sets the default value of VARIABLE to VALUE,


@@ -591,6 +628,17 @@ this sets the local binding in that buffer instead."
        (set variable value))
     (set-default variable value)))
 
        (set variable value))
     (set-default variable value)))
 

+(defun custom-set-minor-mode (variable value)
+  ":set function for minor mode variables.
+Normally, this sets the default value of VARIABLE to nil if VALUE
+is nil and to t otherwise,
+but if `custom-local-buffer' is non-nil,
+this sets the local binding in that buffer instead."
+  (if custom-local-buffer
+      (with-current-buffer custom-local-buffer
+       (funcall variable (if value 1 0)))
+    (funcall variable (if value 1 0))))
+

 (defun custom-quote (sexp)
   "Quote SEXP iff it is not self quoting."
   (if (or (memq sexp '(t nil))
 (defun custom-quote (sexp)
   "Quote SEXP iff it is not self quoting."
   (if (or (memq sexp '(t nil))


@@ -609,13 +657,14 @@ this sets the local binding in that buffer instead."
 (defun customize-mark-to-save (symbol)
   "Mark SYMBOL for later saving.
 
 (defun customize-mark-to-save (symbol)
   "Mark SYMBOL for later saving.
 

-If the default value of SYMBOL is different from the standard value, 
+If the default value of SYMBOL is different from the standard value,

 set the `saved-value' property to a list whose car evaluates to the
 set the `saved-value' property to a list whose car evaluates to the

-default value. Otherwise, set it til nil.
+default value.  Otherwise, set it to nil.

 
 To actually save the value, call `custom-save-all'.
 
 Return non-nil iff the `saved-value' property actually changed."
 
 To actually save the value, call `custom-save-all'.
 
 Return non-nil iff the `saved-value' property actually changed."

+  (custom-load-symbol symbol)

   (let* ((get (or (get symbol 'custom-get) 'default-value))
         (value (funcall get symbol))
         (saved (get symbol 'saved-value))
   (let* ((get (or (get symbol 'custom-get) 'default-value))
         (value (funcall get symbol))
         (saved (get symbol 'saved-value))


@@ -638,26 +687,499 @@ Return non-nil iff the `saved-value' property actually changed."
 (defun customize-mark-as-set (symbol)
   "Mark current value of SYMBOL as being set from customize.
 
 (defun customize-mark-as-set (symbol)
   "Mark current value of SYMBOL as being set from customize.
 

-If the default value of SYMBOL is different from the saved value if any, 
+If the default value of SYMBOL is different from the saved value if any,

 or else if it is different from the standard value, set the
 or else if it is different from the standard value, set the

-`customized-value' property to a list whose car evaluates to the 
-default value. Otherwise, set it til nil.
+`customized-value' property to a list whose car evaluates to the
+default value.  Otherwise, set it to nil.

 
 Return non-nil iff the `customized-value' property actually changed."
 
 Return non-nil iff the `customized-value' property actually changed."

+  (custom-load-symbol symbol)

   (let* ((get (or (get symbol 'custom-get) 'default-value))
         (value (funcall get symbol))
         (customized (get symbol 'customized-value))
         (old (or (get symbol 'saved-value) (get symbol 'standard-value))))
     ;; Mark default value as set iff different from old value.
     (if (or (null old)
   (let* ((get (or (get symbol 'custom-get) 'default-value))
         (value (funcall get symbol))
         (customized (get symbol 'customized-value))
         (old (or (get symbol 'saved-value) (get symbol 'standard-value))))
     ;; Mark default value as set iff different from old value.
     (if (or (null old)

-           (not (equal value (condition-case nil 
+           (not (equal value (condition-case nil

                                  (eval (car old))
                                (error nil)))))
                                  (eval (car old))
                                (error nil)))))

-       (put symbol 'customized-value (list (custom-quote value)))
+       (progn (put symbol 'customized-value (list (custom-quote value)))
+              (custom-push-theme 'theme-value symbol 'user 'set
+                                 (custom-quote value)))

       (put symbol 'customized-value nil))
     ;; Changed?
     (not (equal customized (get symbol 'customized-value)))))
 
       (put symbol 'customized-value nil))
     ;; Changed?
     (not (equal customized (get symbol 'customized-value)))))
 

+(defun custom-reevaluate-setting (symbol)
+  "Reset the value of SYMBOL by re-evaluating its saved or standard value.
+Use the :set function to do so.  This is useful for customizable options
+that are defined before their standard value can really be computed.
+E.g. dumped variables whose default depends on run-time information."
+  (funcall (or (get symbol 'custom-set) 'set-default)
+          symbol
+          (eval (car (or (get symbol 'saved-value) (get symbol 'standard-value))))))
+
+\f
+;;; Custom Themes
+
+;; Custom themes are collections of settings that can be enabled or
+;; disabled as a unit.
+
+;; Each Custom theme is defined by a symbol, called the theme name.
+;; The `theme-settings' property of the theme name records the
+;; variable and face settings of the theme.  This property is a list
+;; of elements, each of the form
+;;
+;;     (PROP SYMBOL THEME VALUE)
+;;
+;;  - PROP is either `theme-value' or `theme-face'
+;;  - SYMBOL is the face or variable name
+;;  - THEME is the theme name (redundant, but simplifies the code)
+;;  - VALUE is an expression that gives the theme's setting for SYMBOL.
+;;
+;; The theme name also has a `theme-feature' property, whose value is
+;; specified when the theme is defined (see `custom-declare-theme').
+;; Usually, this is just a symbol named THEME-theme.  This lets
+;; external libraries call (require 'foo-theme).
+
+;; In addition, each symbol (either a variable or a face) affected by
+;; an *enabled* theme has a `theme-value' or `theme-face' property,
+;; which is a list of elements each of the form
+;;
+;;     (THEME VALUE)
+;;
+;; which have the same meanings as in `theme-settings'.
+;;
+;; The `theme-value' and `theme-face' lists are ordered by decreasing
+;; theme precedence.  Thus, the first element is always the one that
+;; is in effect.
+
+;; Each theme is stored in a theme file, with filename THEME-theme.el.
+;; Loading a theme basically involves calling (load "THEME-theme")
+;; This is done by the function `load-theme'.  Loading a theme
+;; automatically enables it.
+;;
+;; When a theme is enabled, the `theme-value' and `theme-face'
+;; properties for the affected symbols are set.  When a theme is
+;; disabled, its settings are removed from the `theme-value' and
+;; `theme-face' properties, but the theme's own `theme-settings'
+;; property remains unchanged.
+
+(defvar custom-known-themes '(user changed)
+   "Themes that have been defined with `deftheme'.
+The default value is the list (user changed).  The theme `changed'
+contains the settings before custom themes are applied.  The
+theme `user' contains all the settings the user customized and saved.
+Additional themes declared with the `deftheme' macro will be added to
+the front of this list.")
+
+(defsubst custom-theme-p (theme)
+  "Non-nil when THEME has been defined."
+  (memq theme custom-known-themes))
+
+(defsubst custom-check-theme (theme)
+  "Check whether THEME is valid, and signal an error if it is not."
+  (unless (custom-theme-p theme)
+    (error "Unknown theme `%s'" theme)))
+
+(defun custom-push-theme (prop symbol theme mode &optional value)
+  "Record VALUE for face or variable SYMBOL in custom theme THEME.
+PROP is `theme-face' for a face, `theme-value' for a variable.
+
+MODE can be either the symbol `set' or the symbol `reset'.  If it is the
+symbol `set', then VALUE is the value to use.  If it is the symbol
+`reset', then SYMBOL will be removed from THEME (VALUE is ignored).
+
+See `custom-known-themes' for a list of known themes."
+  (unless (memq prop '(theme-value theme-face))
+    (error "Unknown theme property"))
+  (let* ((old (get symbol prop))
+        (setting (assq theme old))  ; '(theme value)
+        (theme-settings             ; '(prop symbol theme value)
+         (get theme 'theme-settings)))
+    (if (eq mode 'reset)
+       ;; Remove a setting.
+       (when setting
+         (let (res)
+           (dolist (theme-setting theme-settings)
+             (if (and (eq (car  theme-setting) prop)
+                      (eq (cadr theme-setting) symbol))
+                 (setq res theme-setting)))
+           (put theme 'theme-settings (delq res theme-settings)))
+         (put symbol prop (delq setting old)))
+      (if setting
+         ;; Alter an existing setting.
+         (let (res)
+           (dolist (theme-setting theme-settings)
+             (if (and (eq (car  theme-setting) prop)
+                      (eq (cadr theme-setting) symbol))
+                 (setq res theme-setting)))
+           (put theme 'theme-settings
+                (cons (list prop symbol theme value)
+                      (delq res theme-settings)))
+           (setcar (cdr setting) value))
+       ;; Add a new setting.
+       ;; If the user changed the value outside of Customize, we
+       ;; first save the current value to a fake theme, `changed'.
+       ;; This ensures that the user-set value comes back if the
+       ;; theme is later disabled.
+       (if (null old)
+           (if (and (eq prop 'theme-value)
+                    (boundp symbol)
+                    (or (null (get symbol 'standard-value))
+                        (not (equal (eval (car (get symbol 'standard-value)))
+                                    (symbol-value symbol)))))
+               (setq old (list (list 'changed (symbol-value symbol))))
+             (if (and (facep symbol)
+                      (not (face-spec-match-p symbol (get symbol 'face-defface-spec))))
+                 (setq old (list (list 'changed (list
+                   (append '(t) (custom-face-attributes-get symbol nil)))))))))
+       (put symbol prop (cons (list theme value) old))
+       (put theme 'theme-settings
+            (cons (list prop symbol theme value)
+                  theme-settings))))))
+
+\f
+(defun custom-set-variables (&rest args)
+  "Install user customizations of variable values specified in ARGS.
+These settings are registered as theme `user'.
+The arguments should each be a list of the form:
+
+  (SYMBOL EXP [NOW [REQUEST [COMMENT]]])
+
+This stores EXP (without evaluating it) as the saved value for SYMBOL.
+If NOW is present and non-nil, then also evaluate EXP and set
+the default value for the SYMBOL to the value of EXP.
+
+REQUEST is a list of features we must require in order to
+handle SYMBOL properly.
+COMMENT is a comment string about SYMBOL."
+  (apply 'custom-theme-set-variables 'user args))
+
+(defun custom-theme-set-variables (theme &rest args)
+  "Initialize variables for theme THEME according to settings in ARGS.
+Each of the arguments in ARGS should be a list of this form:
+
+  (SYMBOL EXP [NOW [REQUEST [COMMENT]]])
+
+This stores EXP (without evaluating it) as the saved value for SYMBOL.
+If NOW is present and non-nil, then also evaluate EXP and set
+the default value for the SYMBOL to the value of EXP.
+
+REQUEST is a list of features we must require in order to
+handle SYMBOL properly.
+COMMENT is a comment string about SYMBOL.
+
+EXP itself is saved unevaluated as SYMBOL property `saved-value' and
+in SYMBOL's list property `theme-value' \(using `custom-push-theme')."
+  (custom-check-theme theme)
+  (setq args
+       (sort args
+             (lambda (a1 a2)
+               (let* ((sym1 (car a1))
+                      (sym2 (car a2))
+                      (1-then-2 (memq sym1 (get sym2 'custom-dependencies)))
+                      (2-then-1 (memq sym2 (get sym1 'custom-dependencies))))
+                 (cond ((and 1-then-2 2-then-1)
+                        (error "Circular custom dependency between `%s' and `%s'"
+                               sym1 sym2))
+                       (2-then-1 nil)
+                       ;; Put minor modes and symbols with :require last.
+                       ;; Putting minor modes last ensures that the mode
+                       ;; function will see other customized values rather
+                       ;; than default values.
+                       (t (or (nth 3 a2)
+                               (eq (get sym2 'custom-set)
+                                   'custom-set-minor-mode))))))))
+  (while args
+    (let ((entry (car args)))
+      (if (listp entry)
+         (let* ((symbol (indirect-variable (nth 0 entry)))
+                (value (nth 1 entry))
+                (now (nth 2 entry))
+                (requests (nth 3 entry))
+                (comment (nth 4 entry))
+                set)
+           (when requests
+             (put symbol 'custom-requests requests)
+             (mapc 'require requests))
+           (setq set (or (get symbol 'custom-set) 'custom-set-default))
+           (put symbol 'saved-value (list value))
+           (put symbol 'saved-variable-comment comment)
+           (custom-push-theme 'theme-value symbol theme 'set value)
+           ;; Allow for errors in the case where the setter has
+           ;; changed between versions, say, but let the user know.
+           (condition-case data
+               (cond (now
+                      ;; Rogue variable, set it now.
+                      (put symbol 'force-value t)
+                      (funcall set symbol (eval value)))
+                     ((default-boundp symbol)
+                      ;; Something already set this, overwrite it.
+                      (funcall set symbol (eval value))))
+             (error
+              (message "Error setting %s: %s" symbol data)))
+           (setq args (cdr args))
+           (and (or now (default-boundp symbol))
+                (put symbol 'variable-comment comment)))
+       ;; Old format, a plist of SYMBOL VALUE pairs.
+       (message "Warning: old format `custom-set-variables'")
+       (ding)
+       (sit-for 2)
+       (let ((symbol (indirect-variable (nth 0 args)))
+             (value (nth 1 args)))
+         (put symbol 'saved-value (list value))
+         (custom-push-theme 'theme-value symbol theme 'set value))
+       (setq args (cdr (cdr args)))))))
+
+\f
+;;; Defining themes.
+
+;; A theme file should be named `THEME-theme.el' (where THEME is the theme
+;; name), and found in either `custom-theme-directory' or the load path.
+;; It has the following format:
+;;
+;;   (deftheme THEME
+;;     DOCSTRING)
+;;
+;;   (custom-theme-set-variables
+;;    'THEME
+;;    [THEME-VARIABLES])
+;;
+;;   (custom-theme-set-faces
+;;    'THEME
+;;    [THEME-FACES])
+;;
+;;   (provide-theme 'THEME)
+
+
+;; The IGNORED arguments to deftheme come from the XEmacs theme code, where
+;; they were used to supply keyword-value pairs like `:immediate',
+;; `:variable-reset-string', etc.  We don't use any of these, so ignore them.
+
+(defmacro deftheme (theme &optional doc &rest ignored)
+  "Declare THEME to be a Custom theme.
+The optional argument DOC is a doc string describing the theme.
+
+Any theme `foo' should be defined in a file called `foo-theme.el';
+see `custom-make-theme-feature' for more information."
+  (let ((feature (custom-make-theme-feature theme)))
+    ;; It is better not to use backquote in this file,
+    ;; because that makes a bootstrapping problem
+    ;; if you need to recompile all the Lisp files using interpreted code.
+    (list 'custom-declare-theme (list 'quote theme) (list 'quote feature) doc)))
+
+(defun custom-declare-theme (theme feature &optional doc &rest ignored)
+  "Like `deftheme', but THEME is evaluated as a normal argument.
+FEATURE is the feature this theme provides.  Normally, this is a symbol
+created from THEME by `custom-make-theme-feature'."
+  (if (memq theme '(user changed))
+      (error "Custom theme cannot be named %S" theme))
+  (add-to-list 'custom-known-themes theme)
+  (put theme 'theme-feature feature)
+  (when doc (put theme 'theme-documentation doc)))
+
+(defun custom-make-theme-feature (theme)
+  "Given a symbol THEME, create a new symbol by appending \"-theme\".
+Store this symbol in the `theme-feature' property of THEME.
+Calling `provide-theme' to provide THEME actually puts `THEME-theme'
+into `features'.
+
+This allows for a file-name convention for autoloading themes:
+Every theme X has a property `provide-theme' whose value is \"X-theme\".
+\(load-theme X) then attempts to load the file `X-theme.el'."
+  (intern (concat (symbol-name theme) "-theme")))
+\f
+;;; Loading themes.
+
+(defcustom custom-theme-directory
+  (if (eq system-type 'ms-dos)
+        ;; MS-DOS cannot have initial dot.
+        "~/_emacs.d/"
+      "~/.emacs.d/")
+  "Directory in which Custom theme files should be written.
+`load-theme' searches this directory in addition to load-path.
+The command `customize-create-theme' writes the files it produces
+into this directory."
+  :type 'string
+  :group 'customize
+  :version "22.1")
+
+(defun provide-theme (theme)
+  "Indicate that this file provides THEME.
+This calls `provide' to provide the feature name stored in THEME's
+property `theme-feature' (which is usually a symbol created by
+`custom-make-theme-feature')."
+  (if (memq theme '(user changed))
+      (error "Custom theme cannot be named %S" theme))
+  (custom-check-theme theme)
+  (provide (get theme 'theme-feature))
+  ;; Loading a theme also enables it.
+  (push theme custom-enabled-themes)
+  ;; `user' must always be the highest-precedence enabled theme.
+  ;; Make that remain true.  (This has the effect of making user settings
+  ;; override the ones just loaded, too.)
+  (let ((custom-enabling-themes t))
+    (enable-theme 'user)))
+
+(defun load-theme (theme)
+  "Load a theme's settings from its file.
+This also enables the theme; use `disable-theme' to disable it."
+  ;; Note we do no check for validity of the theme here.
+  ;; This allows to pull in themes by a file-name convention
+  (interactive "SCustom theme name: ")
+  ;; If reloading, clear out the old theme settings.
+  (when (custom-theme-p theme)
+    (disable-theme theme)
+    (put theme 'theme-settings nil)
+    (put theme 'theme-feature nil)
+    (put theme 'theme-documentation nil))
+  (let ((load-path (if (file-directory-p custom-theme-directory)
+                      (cons custom-theme-directory load-path)
+                    load-path)))
+    (load (symbol-name (custom-make-theme-feature theme)))))
+\f
+;;; Enabling and disabling loaded themes.
+
+(defvar custom-enabling-themes nil)
+
+(defun enable-theme (theme)
+  "Reenable all variable and face settings defined by THEME.
+The newly enabled theme gets the highest precedence (after `user').
+If it is already enabled, just give it highest precedence (after `user').
+
+If THEME does not specify any theme settings, this tries to load
+the theme from its theme file, by calling `load-theme'."
+  (interactive "SEnable Custom theme: ")
+  (if (not (custom-theme-p theme))
+      (load-theme theme)
+    ;; This could use a bit of optimization -- cyd
+    (let ((settings (get theme 'theme-settings)))
+      (dolist (s settings)
+       (let* ((prop (car s))
+              (symbol (cadr s))
+              (spec-list (get symbol prop)))
+         (put symbol prop (cons (cddr s) (assq-delete-all theme spec-list)))
+         (if (eq prop 'theme-value)
+             (custom-theme-recalc-variable symbol)
+           (custom-theme-recalc-face symbol)))))
+    (unless (eq theme 'user)
+      (setq custom-enabled-themes
+           (cons theme (delq theme custom-enabled-themes)))
+      (unless custom-enabling-themes
+       (enable-theme 'user)))))
+
+(defcustom custom-enabled-themes nil
+  "List of enabled Custom Themes, highest precedence first.
+
+This does not include the `user' theme, which is set by Customize,
+and always takes precedence over other Custom Themes."
+  :group 'customize
+  :type  '(repeat symbol)
+  :set (lambda (symbol themes)
+        ;; Avoid an infinite loop when custom-enabled-themes is
+        ;; defined in a theme (e.g. `user').  Enabling the theme sets
+        ;; custom-enabled-themes, which enables the theme...
+        (unless custom-enabling-themes
+          (let ((custom-enabling-themes t) failures)
+            (setq themes (delq 'user (delete-dups themes)))
+            (if (boundp symbol)
+                (dolist (theme (symbol-value symbol))
+                  (if (not (memq theme themes))
+                      (disable-theme theme))))
+            (dolist (theme (reverse themes))
+              (condition-case nil
+                  (enable-theme theme)
+                (error (progn (push theme failures)
+                              (setq themes (delq theme themes))))))
+            (enable-theme 'user)
+            (custom-set-default symbol themes)
+            (if failures
+                (message "Failed to enable themes: %s"
+                         (mapconcat 'symbol-name failures " ")))))))
+
+(defsubst custom-theme-enabled-p (theme)
+  "Return non-nil if THEME is enabled."
+  (memq theme custom-enabled-themes))
+
+(defun disable-theme (theme)
+  "Disable all variable and face settings defined by THEME.
+See `custom-enabled-themes' for a list of enabled themes."
+  (interactive (list (intern
+                     (completing-read
+                      "Disable Custom theme: "
+                      (mapcar 'symbol-name custom-enabled-themes)
+                      nil t))))
+  (when (custom-theme-enabled-p theme)
+    (let ((settings (get theme 'theme-settings)))
+      (dolist (s settings)
+       (let* ((prop (car s))
+              (symbol (cadr s))
+              (spec-list (get symbol prop)))
+         (put symbol prop (assq-delete-all theme spec-list))
+         (if (eq prop 'theme-value)
+             (custom-theme-recalc-variable symbol)
+           (custom-theme-recalc-face symbol)))))
+    (setq custom-enabled-themes
+         (delq theme custom-enabled-themes))))
+
+(defun custom-variable-theme-value (variable)
+  "Return (list VALUE) indicating the custom theme value of VARIABLE.
+That is to say, it specifies what the value should be according to
+currently enabled custom themes.
+
+This function returns nil if no custom theme specifies a value for VARIABLE."
+  (let* ((theme-value (get variable 'theme-value)))
+    (if theme-value
+       (cdr (car theme-value)))))
+
+(defun custom-theme-recalc-variable (variable)
+  "Set VARIABLE according to currently enabled custom themes."
+  (let ((valspec (custom-variable-theme-value variable)))
+    (if valspec
+       (put variable 'saved-value valspec)
+      (setq valspec (get variable 'standard-value)))
+    (if (and valspec
+            (or (get variable 'force-value)
+                (default-boundp variable)))
+       (funcall (or (get variable 'custom-set) 'set-default) variable
+                (eval (car valspec))))))
+
+(defun custom-theme-recalc-face (face)
+  "Set FACE according to currently enabled custom themes."
+  (if (facep face)
+      (let ((theme-faces (reverse (get face 'theme-face))))
+       (dolist (spec theme-faces)
+         (face-spec-set face (cadr spec))))))
+\f
+;;; XEmacs compability functions
+
+;; In XEmacs, when you reset a Custom Theme, you have to specify the
+;; theme to reset it to.  We just apply the next available theme, so
+;; just ignore the IGNORED arguments.
+
+(defun custom-theme-reset-variables (theme &rest args)
+  "Reset some variable settings in THEME to their values in other themes.
+Each of the arguments ARGS has this form:
+
+    (VARIABLE IGNORED)
+
+This means reset VARIABLE.  (The argument IGNORED is ignored)."
+  (custom-check-theme theme)
+  (dolist (arg args)
+    (custom-push-theme 'theme-value (car arg) theme 'reset)))
+
+(defun custom-reset-variables (&rest args)
+  "Reset the specs of some variables to their values in other themes.
+This creates settings in the `user' theme.
+
+Each of the arguments ARGS has this form:
+
+    (VARIABLE IGNORED)
+
+This means reset VARIABLE.  (The argument IGNORED is ignored)."
+    (apply 'custom-theme-reset-variables 'user args))
+

 ;;; The End.
 
 ;; Process the defcustoms for variables loaded before this file.
 ;;; The End.
 
 ;; Process the defcustoms for variables loaded before this file.


@@ -667,4 +1189,5 @@ Return non-nil iff the `customized-value' property actually changed."
 
 (provide 'custom)
 
 
 (provide 'custom)
 

+;; arch-tag: 041b6116-aabe-4f9a-902d-74092bc3dab2

 ;;; custom.el ends here
 ;;; custom.el ends here