diff options
author | Chong Yidong <cyd@stupidchicken.com> | 2010-10-11 00:49:59 -0400 |
---|---|---|
committer | Chong Yidong <cyd@stupidchicken.com> | 2010-10-11 00:49:59 -0400 |
commit | 05d22d02175330f9a9899d5daa431b1fdaf28470 (patch) | |
tree | b1cf3b77165eb9c54e028b44eb96466ab6210c6f /lisp/cus-edit.el | |
parent | df187c6252439abcc958bbeb507344d6781b46e7 (diff) | |
download | emacs-05d22d02175330f9a9899d5daa431b1fdaf28470.tar.gz |
More cleanups and minor fixes for Customize.
* cus-edit.el (custom-face-edit-fix-value): Use
custom-fix-face-spec.
* custom.el (custom-push-theme): Cleanup (use cond).
(disable-theme): Recompute the saved-face property.
(custom-theme-recalc-face): Follow face alias before setting prop.
* custom.el (custom-fix-face-spec): New function; code moved from
custom-face-edit-fix-value.
(custom-push-theme): Use it when checking if a face has been
changed outside customize.
(custom-available-themes): New function.
(load-theme): Use it.
* image.el (image-checkbox-checked, image-checkbox-unchecked): New
variables, containing checkbox images.
* startup.el (fancy-startup-tail):
* wid-edit.el (checkbox): Use them.
Diffstat (limited to 'lisp/cus-edit.el')
-rw-r--r-- | lisp/cus-edit.el | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index 8a9775b0ebf..1b69d0c59b2 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -3102,27 +3102,7 @@ face attributes (as specified by a `default' defface entry)." (defun custom-face-edit-fix-value (widget value) "Ignoring WIDGET, convert :bold and :italic in VALUE to new form. Also change :reverse-video to :inverse-video." - (if (listp value) - (let (result) - (while value - (let ((key (car value)) - (val (car (cdr value)))) - (cond ((eq key :italic) - (push :slant result) - (push (if val 'italic 'normal) result)) - ((eq key :bold) - (push :weight result) - (push (if val 'bold 'normal) result)) - ((eq key :reverse-video) - (push :inverse-video result) - (push val result)) - (t - (push key result) - (push val result)))) - (setq value (cdr (cdr value)))) - (setq result (nreverse result)) - result) - value)) + (custom-fix-face-spec value)) (defun custom-face-edit-convert-widget (widget) "Convert :args as widget types in WIDGET." |