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/startup.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/startup.el')
| -rw-r--r-- | lisp/startup.el | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index c029eff54cf..aa791f2a04a 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1563,23 +1563,21 @@ a face or button specification." (kill-buffer "*GNU Emacs*"))) " ") (when (or user-init-file custom-file) - (let ((checked (create-image "\300\300\141\143\067\076\034\030" - 'xbm t :width 8 :height 8 :background "grey75" - :foreground "black" :relief -2 :ascent 'center)) - (unchecked (create-image (make-string 8 0) - 'xbm t :width 8 :height 8 :background "grey75" - :foreground "black" :relief -2 :ascent 'center))) - (insert-button - " " :on-glyph checked :off-glyph unchecked 'checked nil - 'display unchecked 'follow-link t - 'action (lambda (button) - (if (overlay-get button 'checked) - (progn (overlay-put button 'checked nil) - (overlay-put button 'display (overlay-get button :off-glyph)) - (setq startup-screen-inhibit-startup-screen nil)) - (overlay-put button 'checked t) - (overlay-put button 'display (overlay-get button :on-glyph)) - (setq startup-screen-inhibit-startup-screen t))))) + (insert-button + " " + :on-glyph image-checkbox-checked + :off-glyph image-checkbox-unchecked + 'checked nil 'display image-checkbox-unchecked 'follow-link t + 'action (lambda (button) + (if (overlay-get button 'checked) + (progn (overlay-put button 'checked nil) + (overlay-put button 'display + (overlay-get button :off-glyph)) + (setq startup-screen-inhibit-startup-screen nil)) + (overlay-put button 'checked t) + (overlay-put button 'display + (overlay-get button :on-glyph)) + (setq startup-screen-inhibit-startup-screen t)))) (fancy-splash-insert :face '(variable-pitch (:height 0.9)) " Never show it again."))))) |