comparison lisp/custom.el @ 90399:a5812696f7bf unicode-pre-font-backend

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 274-284) - Update from CVS - Update etc/MORE.STUFF. - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 101) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-62
author Miles Bader <miles@gnu.org>
date Wed, 17 May 2006 07:46:49 +0000
parents c156f6a9e7b5 af9f1a83e3cf
children 8a8e69664178
comparison
equal deleted inserted replaced
90398:1f8d5cd37cf0 90399:a5812696f7bf
823 ;; first save the current value to a fake theme, `changed'. 823 ;; first save the current value to a fake theme, `changed'.
824 ;; This ensures that the user-set value comes back if the 824 ;; This ensures that the user-set value comes back if the
825 ;; theme is later disabled. 825 ;; theme is later disabled.
826 (if (null old) 826 (if (null old)
827 (if (and (eq prop 'theme-value) 827 (if (and (eq prop 'theme-value)
828 (boundp symbol) 828 (boundp symbol))
829 (or (null (get symbol 'standard-value)) 829 (let ((sv (get symbol 'standard-value)))
830 (not (equal (eval (car (get symbol 'standard-value))) 830 (when (and (null sv) (custom-variable-p symbol))
831 (symbol-value symbol))))) 831 (custom-load-symbol symbol)
832 (setq old (list (list 'changed (symbol-value symbol)))) 832 (setq sv (get symbol 'standard-value)))
833 (if (or (null sv)
834 (not (equal (eval (car (get symbol 'standard-value)))
835 (symbol-value symbol))))
836 (setq old (list (list 'changed (symbol-value symbol))))))
833 (if (and (facep symbol) 837 (if (and (facep symbol)
834 (not (face-spec-match-p symbol (get symbol 'face-defface-spec)))) 838 (not (face-spec-match-p symbol (get symbol 'face-defface-spec))))
835 (setq old (list (list 'changed (list 839 (setq old (list (list 'changed (list
836 (append '(t) (custom-face-attributes-get symbol nil))))))))) 840 (append '(t) (custom-face-attributes-get symbol nil)))))))))
837 (put symbol prop (cons (list theme value) old)) 841 (put symbol prop (cons (list theme value) old))