Index: emacs/lisp/custom.el
diff -c emacs/lisp/custom.el:1.89 emacs/lisp/custom.el:1.90
*** emacs/lisp/custom.el:1.89 Mon Jul 11 00:57:23 2005
--- emacs/lisp/custom.el Mon Jul 11 01:05:17 2005
***************
*** 983,992 ****
;; 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.
! ;; 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-loaded-themes nil
"Custom themes that have been loaded.")
--- 983,998 ----
;; 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.")
***************
*** 1101,1107 ****
(if (eq prop 'theme-value)
(custom-theme-recalc-variable symbol)
(custom-theme-recalc-face symbol)))))
! (push theme custom-enabled-themes)
;; `user' must always be the highest-precedence enabled theme.
(unless (eq theme 'user)
(custom-enable-theme 'user)))
--- 1107,1113 ----
(if (eq prop 'theme-value)
(custom-theme-recalc-variable symbol)
(custom-theme-recalc-face symbol)))))
! (push theme (delq theme custom-enabled-themes))
;; `user' must always be the highest-precedence enabled theme.
(unless (eq theme 'user)
(custom-enable-theme 'user)))
_______________________________________________
Emacs-diffs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/emacs-diffs
