aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2005-09-06 03:14:46 +0000
committerChong Yidong2005-09-06 03:14:46 +0000
commitf4885d8137feeee620e5cd224093d1fcb71b3af0 (patch)
treeaf0f9ca70c9a65150253e335b659f8362ccfa5e2
parent4a2358e9b441957fee140ac981cea71720984e6f (diff)
downloademacs-f4885d8137feeee620e5cd224093d1fcb71b3af0.tar.gz
emacs-f4885d8137feeee620e5cd224093d1fcb71b3af0.zip
Fix last change to custom-push-theme.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/custom.el3
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6ad9d6e4d9b..d1e102b52da 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
12005-09-05 Chong Yidong <cyd@stupidchicken.com> 12005-09-05 Chong Yidong <cyd@stupidchicken.com>
2 2
3 * custom.el (custom-push-theme): Fix last change.
4
52005-09-05 Chong Yidong <cyd@stupidchicken.com>
6
3 * cus-theme.el (custom-theme-write-faces): Save the current face 7 * cus-theme.el (custom-theme-write-faces): Save the current face
4 spec, not the defface spec. 8 spec, not the defface spec.
5 9
diff --git a/lisp/custom.el b/lisp/custom.el
index 2b714a7b458..d634160e534 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -649,7 +649,8 @@ See `custom-known-themes' for a list of known themes."
649 (progn 649 (progn
650 (setcar (cdr setting) mode) 650 (setcar (cdr setting) mode)
651 (setcar (cddr setting) value)) 651 (setcar (cddr setting) value))
652 (if (null old) 652 (if (and (null old)
653 (boundp symbol))
653 (setq old 654 (setq old
654 (list 655 (list
655 (list 'standard 'set 656 (list 'standard 'set