[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/custom.el
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/custom.el |
Date: |
Mon, 12 Sep 2005 18:05:20 -0400 |
Index: emacs/lisp/custom.el
diff -c emacs/lisp/custom.el:1.102 emacs/lisp/custom.el:1.103
*** emacs/lisp/custom.el:1.102 Tue Sep 6 03:14:46 2005
--- emacs/lisp/custom.el Mon Sep 12 22:05:17 2005
***************
*** 649,665 ****
(progn
(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.
(put theme 'theme-settings
--- 649,664 ----
(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