[Emacs-diffs] Changes to emacs/lisp/custom.el

[Chong Yidong]

Index: emacs/lisp/custom.el
diff -c emacs/lisp/custom.el:1.106 emacs/lisp/custom.el:1.107
*** emacs/lisp/custom.el:1.106  Mon Nov 21 07:56:50 2005
--- emacs/lisp/custom.el        Fri Nov 25 18:00:10 2005
***************
*** 1120,1128 ****
  (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')."
    (interactive "SEnable Custom theme: ")
    (let ((settings (get theme 'theme-settings)))
      (dolist (s settings)
        (let* ((prop (car s))
             (symbol (cadr s))
--- 1120,1133 ----
  (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').
! 
! This signals an error if THEME does not specify any theme
! settings.  Theme settings are set using `load-theme'."
    (interactive "SEnable Custom theme: ")
    (let ((settings (get theme 'theme-settings)))
+     (if (and (not (eq theme 'user)) (null settings))
+       (error "No theme settings defined in %s." (symbol-name theme)))
      (dolist (s settings)
        (let* ((prop (car s))
             (symbol (cadr s))
***************
*** 1130,1136 ****
        (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)))))
    (setq custom-enabled-themes
          (cons theme (delq theme custom-enabled-themes)))
    ;; `user' must always be the highest-precedence enabled theme.
--- 1135,1142 ----
        (put symbol prop (cons (cddr s) (assq-delete-all theme spec-list)))
        (if (eq prop 'theme-value)
            (custom-theme-recalc-variable symbol)
!         (if (facep symbol)
!             (custom-theme-recalc-face symbol))))))
    (setq custom-enabled-themes
          (cons theme (delq theme custom-enabled-themes)))
    ;; `user' must always be the highest-precedence enabled theme.