From 4359915b869931b94d530d9c6e1347f260d66951 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Mon, 21 Mar 2011 00:30:55 -0400 Subject: [PATCH] Several fixes to cus-theme.el. * lisp/cus-theme.el: Add missing provide statement. (customize-create-theme): Extract theme value correctly. (custom-theme-visit-theme): Autoload. (customize-create-theme): Prompt before inserting default faces. --- lisp/ChangeLog | 7 +++++++ lisp/cus-theme.el | 10 ++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b12445b466..d568b07bb1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2011-03-21 Chong Yidong + + * cus-theme.el: Add missing provide statement. + (customize-create-theme): Extract theme value correctly. + (custom-theme-visit-theme): Autoload. + (customize-create-theme): Prompt before inserting default faces. + 2011-03-20 Jay Belanger * calc/calc-menu.el (calc-units-menu): Add entries for logarithmic diff --git a/lisp/cus-theme.el b/lisp/cus-theme.el index cdc066aa91..4f9428d497 100644 --- a/lisp/cus-theme.el +++ b/lisp/cus-theme.el @@ -100,6 +100,9 @@ named *Custom Theme*." (make-local-variable 'custom-theme-insert-face-marker) (make-local-variable 'custom-theme-insert-variable-marker) (make-local-variable 'custom-theme--listed-faces) + (when (called-interactively-p 'interactive) + (unless (y-or-n-p "Include basic face customizations in this theme? ") + (setq custom-theme--listed-faces nil))) (if (eq theme 'user) (widget-insert "This buffer contains all the Custom settings you have made. @@ -188,7 +191,7 @@ remove them from your saved Custom file.\n\n")) (while vars (if (eq (car vars) 'custom-enabled-themes) (progn (pop vars) (pop values)) - (custom-theme-add-var-1 (pop vars) (pop values))))) + (custom-theme-add-var-1 (pop vars) (eval (pop values)))))) (setq custom-theme-insert-variable-marker (point-marker)) (widget-insert " ") (widget-create 'push-button @@ -297,8 +300,9 @@ SPEC, if non-nil, should be a face spec to which to set the widget." ;;; Reading and writing +;;;###autoload (defun custom-theme-visit-theme (theme) - "Load the custom theme THEME's settings into the current buffer." + "Set up a Custom buffer to edit custom theme THEME." (interactive (list (intern (completing-read "Find custom theme: " @@ -663,4 +667,6 @@ Theme files are named *-theme.el in `")) (widget-toggle-action widget event) (setq custom-theme-allow-multiple-selections (widget-value widget))) +(provide 'cus-theme) + ;;; cus-theme.el ends here -- 2.20.1