Changeset 4018 for vendor/emacs-CVS_HEAD/lisp/custom.el

Timestamp:

01/28/06 09:46:44 (3 years ago)

Author:

miyoshi

Message:

Update.

Files:

• vendor/emacs-CVS_HEAD/lisp/custom.el (modified) (10 diffs)

vendor/emacs-CVS_HEAD/lisp/custom.el

@@ -600 +600 @@
-              (t (condition-case nil (load load) (error nil))))))))
-
-(defvar custom-known-themes '(user standard)
-   "Themes that have been defined with `deftheme'.
-The default value is the list (user standard).  The theme `standard'
-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)))
-
-;;; Initializing.
-
-(defun custom-push-theme (prop symbol theme mode value)
-  "Record a value for face or variable SYMBOL in custom theme THEME.
-PROP is`theme-face' for a face, `theme-value' for a variable.
-The value is specified by (THEME MODE VALUE), which is interpreted
-by `custom-theme-value'.
-
-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 VALUE is another theme, whose value for this face or
-variable should be used.
-
-In the following example for the variable `goto-address-url-face', the
-theme `subtle-hacker' uses the same value for the variable as the theme
-`gnome2':
-
-  \((standard set bold)
-   \(gnome2 set info-xref)
-   \(jonadab set underline)
-   \(subtle-hacker reset gnome2))
-
-
-If a value has been stored for themes A B and C, and a new value
-is to be stored for theme C, then the old value of C is discarded.
-If a new value is to be stored for theme B, however, the old value
-of B is not discarded because B is not the car of the list.
-
-For variables, list property PROP is `theme-value'.
-For faces, list property PROP is `theme-face'.
-This is used in `custom-do-theme-reset', for example.
-
-The list looks the same in any case; the examples shows a possible
-value of the `theme-face' property for the face `region':
-
-  \((gnome2 set ((t (:foreground \"cyan\" :background \"dark cyan\"))))
-   \(standard set ((((class color) (background dark))
-                   \(:background \"blue\"))
-                  \(t (:background \"gray\")))))
-
-This records values for the `standard' and the `gnome2' themes.
-The user has not customized the face; had he done that,
-the list would contain an entry for the `user' theme, too.
-See `custom-known-themes' for a list of known themes."
-  (let* ((old (get symbol prop))
-         (setting (assq theme old)))
-    ;; Alter an existing theme-setting for the symbol,
-    ;; or add a new one.
-    (if setting
-        (progn
-          (setcar (cdr setting) mode)
-          (setcar (cddr setting) value))
-      ;; If no custom theme has been applied yet, first save the
-      ;; current values to the 'standard theme.
-      (if (null old)
-          (if (and (eq prop 'theme-value)
-                   (boundp symbol))
-              (setq old
-                    (list (list 'standard 'set (symbol-value symbol))))
-            (if (facep symbol)
-                (setq old (list (list 'standard 'set (list
-                  (append '(t) (custom-face-attributes-get symbol nil)))))))))
-      (put symbol prop (cons (list theme mode value) old)))
-    ;; Record, for each theme, all its settings.
-    (put theme 'theme-settings
-         (cons (list prop symbol theme mode value)
-               (get theme 'theme-settings)))))
-
-(defvar custom-local-buffer nil
-  "Non-nil, in a Customization buffer, means customize a specific buffer.
@@ -693 +608 @@
-(put 'custom-local-buffer 'permanent-local t)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-(defun custom-reevaluate-setting (symbol)
@@ -718 +705 @@
-           (eval (car (or (get symbol 'saved-value) (get symbol 'standard-value))))))
-
+
+;;; 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 (facep symbol)
+                  (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))))))
+
+
+(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.
@@ -731 +854 @@
-handle SYMBOL properly.
-COMMENT is a comment string about SYMBOL.
-
-Several properties of THEME and SYMBOL are used in the process:
-
-If THEME's property `theme-immediate' is non-nil, this is equivalent of
-providing the NOW argument to all symbols in the argument list:
-evaluate each EXP and set the corresponding SYMBOL.  However,
-there's a difference in the handling of SYMBOL's property
-`force-value': if NOW is non-nil, SYMBOL's property `force-value' is set to
-the symbol `rogue', else if THEME's property `theme-immediate' is non-nil,
-SYMBOL's property `force-value' is set to the symbol `immediate'.
-
-EXP itself is saved unevaluated as SYMBOL property `saved-value' and
@@ -804 +917 @@
-        (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,
-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
-        (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))
-          (keywordp sexp)
-          (and (listp sexp)
-               (memq (car sexp) '(lambda)))
-          (stringp sexp)
-          (numberp sexp)
-          (vectorp sexp)
-;;;       (and (fboundp 'characterp)
-;;;            (characterp sexp))
-          )
-      sexp
-    (list 'quote sexp)))
-
-(defun customize-mark-to-save (symbol)
-  "Mark SYMBOL for later saving.
-
-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
-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."
-  (let* ((get (or (get symbol 'custom-get) 'default-value))
-         (value (funcall get symbol))
-         (saved (get symbol 'saved-value))
-         (standard (get symbol 'standard-value))
-         (comment (get symbol 'customized-variable-comment)))
-    ;; Save default value iff different from standard value.
-    (if (or (null standard)
-            (not (equal value (condition-case nil
-                                  (eval (car standard))
-                                (error nil)))))
-        (put symbol 'saved-value (list (custom-quote value)))
-      (put symbol 'saved-value nil))
-    ;; Clear customized information (set, but not saved).
-    (put symbol 'customized-value nil)
-    ;; Save any comment that might have been set.
-    (when comment
-      (put symbol 'saved-variable-comment comment))
-    (not (equal saved (get symbol 'saved-value)))))
-
-(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,
-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 to nil.
-
-Return non-nil iff the `customized-value' property actually changed."
-  (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
-                                  (eval (car old))
-                                (error nil)))))
-        (put symbol 'customized-value (list (custom-quote value)))
-      (put symbol 'customized-value nil))
-    ;; Changed?
-    (not (equal customized (get symbol 'customized-value)))))
-
-;;; Defining themes.
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-The optional argument DOC is a doc string describing the theme.
-The remaining arguments should have the form
-
-   [KEYWORD VALUE]...
-
-The following KEYWORD's are defined:
-
-:short-description
-        VALUE is a short (one line) description of the theme.  If not
-        given, DOC is used.
-:immediate
-        If VALUE is non-nil, variables specified in this theme are set
-        immediately when loading the theme.
-:variable-set-string
-        VALUE is a string used to indicate that a variable takes its
-        setting from this theme.  It is passed to FORMAT with the name
-        of the theme as an additional argument.  If not given, a
-        generic description is used.
-:variable-reset-string
-        VALUE is a string used in the case a variable has been forced
-        to its value in this theme.  It is passed to FORMAT with the
-        name of the theme as an additional argument.  If not given, a
-        generic description is used.
-:face-set-string
-        VALUE is a string used to indicate that a face takes its
-        setting from this theme.  It is passed to FORMAT with the name
-        of the theme as an additional argument.  If not given, a
-        generic description is used.
-:face-reset-string
-        VALUE is a string used in the case a face has been forced to
-        its value in this theme.  It is passed to FORMAT with the name
-        of the theme as an additional argument.  If not given, a
-        generic description is used.
-
-Any theme `foo' should be defined in a file called `foo-theme.el';
@@ -938 +952 @@
-    ;; because that makes a bootstrapping problem
-    ;; if you need to recompile all the Lisp files using interpreted code.
-
-
-
-
-
-
-
+
+
+
-  "Like `deftheme', but THEME is evaluated as a normal argument.
-
-
+
+
+
+
-  (add-to-list 'custom-known-themes theme)
-  (put theme 'theme-feature feature)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-(defun custom-make-theme-feature (theme)
@@ -987 +976 @@
-
-;;; Loading themes.
-
-;; The variable and face settings of a theme are recorded in
-;; the `theme-settings' property of the theme name.
-;; This property's value is a list of elements, each of the form
-;; (PROP SYMBOL THEME MODE VALUE), where PROP is `theme-value' or `theme-face'
-;; and SYMBOL is the face or variable name.
-;; THEME is the theme name itself; that's redundant, but simplifies things.
-;; MODE is `set' or `reset'.
-;; If MODE is `set', then VALUE is an expression that specifies the
-;; theme's setting for SYMBOL.
-;; If MODE is `reset', then VALUE is another theme,
-;; and it means to use the value from that theme.
-
-;; Each variable has a `theme-value' property that describes all the
-;; settings of enabled themes that apply to it.
-;; Each face name has a `theme-face' property that describes all the
-;; settings of enabled themes that apply to it.
-;; The property value is a list of settings, each with the form
-;; (THEME MODE VALUE).  THEME, MODE and VALUE are as above.
-;; Each of these lists is ordered by decreasing theme precedence.
-;; Thus, the first element is always the one that is in effect.
-
-;; Disabling a theme removes its settings from the `theme-value' and
-;; `theme-face' properties, but the theme's own `theme-settings'
-;; property remains unchanged.
-
-;; Loading a theme implicitly enables it.  Enabling a theme adds its
-;; settings to the symbols' `theme-value' and `theme-face' properties,
-;; or moves them to the front of those lists if they're already present.
-
-(defvar custom-loaded-themes nil
-  "Custom themes that have been loaded.")
-
-(defcustom custom-theme-directory
@@ -1033 +990 @@
-  :version "22.1")
-
-(defun custom-theme-loaded-p (theme)
-  "Return non-nil if THEME has been loaded."
-  (memq theme custom-loaded-themes))
-
-(defvar custom-enabled-themes '(user)
-  "Custom themes currently enabled, highest precedence first.
-The first one is always `user'.")
-
-(defun custom-theme-enabled-p (theme)
-  "Return non-nil if THEME is enabled."
-  (memq theme custom-enabled-themes))
-
-(defun provide-theme (theme)
-  "Indicate that this file provides THEME.
-
-
-
-
-
+
+
+
+
+
-  (custom-check-theme theme)
-  (provide (get theme 'theme-feature))
-
-
-
+
-  (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.)
-
+
+
-
-(defun load-theme (theme)
-Try to l
+L
-This also enables the theme; use `disable-theme' to disable it."
-
-  ;; THEME's feature is stored in THEME's `theme-feature' property.
-  ;; Usually the `theme-feature' property contains a symbol created
-  ;; by `custom-make-theme-feature'.
-
-  ;; 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)))
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-;;; Enabling and disabling loaded themes.
+
+(defvar custom-enabling-themes nil)
-
-(defun enable-theme (theme)
@@ -1123 +1033 @@
-If it is already enabled, just give it highest precedence (after `user').
-
-
-settings.  Theme settings are set us
+
+the theme from its theme file, by call
-  (interactive "SEnable Custom theme: ")
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-(defun disable-theme (theme)
-  "Disable all variable and face settings defined by THEME.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-(defun custom-variable-theme-value (variable)
@@ -1190 +1116 @@
-  (let* ((theme-value (get variable 'theme-value)))
-    (if theme-value
-ustom-theme-value (car (car theme-value)) theme-value
+dr (car theme-value)
-
-(defun custom-theme-recalc-variable (variable)
-  "Set VARIABLE according to currently enabled custom themes."
-  (let ((valspec (custom-variable-theme-value variable)))
-
-
-
+
+
-      (setq valspec (get variable 'standard-value)))
-
-
-
-
+
+
+
+
+
-
-(defun custom-theme-recalc-face (face)
-  "Set FACE according to currently enabled custom themes."
-
-
-
+
+
+
+
-
+;;; 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)
-the specs in THEME of some variables
+some variable settings in THEME
-Each of the arguments ARGS has this form:
-
-FROM-THEME
-
- to its value in FROM-THEME
+IGNORED
+
+.  (The argument IGNORED is ignored)
-  (custom-check-theme theme)
-  (dolist (arg args)
- (cadr arg)
+
-
-(defun custom-reset-variables (&rest args)
-certain
+other
-This creates settings in the `user' theme.
-
-Each of the arguments ARGS has this form:
-
-FROM-THEME
-
- to its value in FROM-THEME
+IGNORED
+
+.  (The argument IGNORED is ignored)
-    (apply 'custom-theme-reset-variables 'user args))
-