Changeset 3863 for trunk/lisp/custom.el

Timestamp:

09/10/05 10:16:00 (3 years ago)

Author:

miyoshi

Message:

--

Files:

• trunk/lisp/custom.el (modified) (12 diffs)

trunk/lisp/custom.el

@@ -584 +584 @@
-   "Themes that have been defined with `deftheme'.
-The default value is the list (user standard).  The theme `standard'
-Emacs standard settings from the original Lisp files
+settings before custom themes are applied
-theme `user' contains all the settings the user customized and saved.
-Additional themes declared with the `deftheme' macro will be added to
@@ -650 +650 @@
-          (setcar (cdr setting) mode)
-          (setcar (cddr setting) value))
+      (if (and (null old)
+               (boundp symbol))
+          (setq old
+                (list
+                 (list 'standard 'set
+                       (if (eq prop 'theme-value)
+                           (symbol-value symbol)
+                         (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.
@@ -954 +965 @@
-This allows for a file-name convention for autoloading themes:
-Every theme X has a property `provide-theme' whose value is \"X-theme\".
-require
+load
-  (intern (concat (symbol-name theme) "-theme")))
-
@@ -997 +1008 @@
-      "~/.emacs.d/")
-  "Directory in which Custom theme files should be written.
-require
+load
-The command `customize-create-theme' writes the files it produces
-into this directory."
@@ -1032 +1043 @@
-  ;; Make that remain true.  (This has the effect of making user settings
-  ;; override the ones just loaded, too.)
-custom-
-
-require
+
+
+load
-  "Try to load a theme's settings from its file.
-custom-
+
-
-  ;; THEME's feature is stored in THEME's `theme-feature' property.
@@ -1044 +1055 @@
-  ;; 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: ")
-  (let ((load-path (if (file-directory-p custom-theme-directory)
-                       (cons custom-theme-directory load-path)
@@ -1071 +1083 @@
-    (dolist (theme body)
-      (cond ((and (consp theme) (eq (car theme) 'reset))
-custom-
+
-            ((and (consp theme) (eq (car theme) 'hidden))
-require
-custom-
+load
+
-            (t
-require
+load
-      (push theme themes-loaded))
-    (put by-theme 'theme-loads-themes themes-loaded)))
@@ -1088 +1100 @@
-;;; Enabling and disabling loaded themes.
-
-custom-
+
-  "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')."
+  (interactive "SEnable Custom theme: ")
-  (let ((settings (get theme 'theme-settings)))
-    (dolist (s settings)
@@ -1105 +1118 @@
-  ;; `user' must always be the highest-precedence enabled theme.
-  (unless (eq theme 'user)
-custom-
-
-custom-
+
+
+
-  "Disable all variable and face settings defined by THEME.
-See `custom-known-themes' for a list of known themes."
+  (interactive "SDisable Custom theme: ")
-  (let ((settings (get theme 'theme-settings)))
-    (dolist (s settings)
@@ -1115 +1129 @@
-             (symbol (cadr s))
-             (spec-list (get symbol prop)))
-'theme-value
+prop
-        (if (eq prop 'theme-value)
-            (custom-theme-recalc-variable symbol)
@@ -1154 +1168 @@
-        (custom-theme-value (car (car theme-value)) theme-value))))
-
-(defun custom-face-theme-value (face)
-  "Return the face spec of FACE according to currently enabled custom themes.
-This function returns nil if no custom theme specifies anything for FACE."
-  (let* ((theme-value (get face 'theme-face)))
-    (if theme-value
-        (custom-theme-value (car (car theme-value)) theme-value))))
-
-(defun custom-theme-recalc-variable (variable)
-  "Set VARIABLE according to currently enabled custom themes."
@@ -1175 +1182 @@
-(defun custom-theme-recalc-face (face)
-  "Set FACE according to currently enabled custom themes."
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-(defun custom-theme-reset-variables (theme &rest args)