Merge from emacs-23; up to 2010-06-11T14:39:54Z!cyd@stupidchicken.com.

[gnu-emacs] / lisp / cus-theme.el

diff --git a/lisp/cus-theme.el b/lisp/cus-theme.el
index f29dd9eb21321771537534bc297366b3e3c1aa46..86fb43be72ac5ad147b52febda63fee6396dde14 100644 (file)
--- 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.
@@ -109,13 +112,13 @@ remove them from your saved Custom file.\n\n"))
   (widget-create 'push-button
                 :tag " Visit Theme "
                 :help-echo "Insert the settings of a pre-defined theme."
-                :action (lambda (widget &optional event)
+                :action (lambda (_widget &optional _event)
                           (call-interactively 'custom-theme-visit-theme)))
   (widget-insert "  ")
   (widget-create 'push-button
                 :tag " Merge Theme "
                 :help-echo "Merge in the settings of a pre-defined theme."
-                :action (lambda (widget &optional event)
+                :action (lambda (_widget &optional _event)
                           (call-interactively 'custom-theme-merge-theme)))
   (widget-insert "  ")
   (widget-create 'push-button
@@ -179,7 +182,7 @@ remove them from your saved Custom file.\n\n"))
                   :button-face 'custom-link
                   :mouse-face 'highlight
                   :pressed-face 'highlight
-                  :action (lambda (widget &optional event)
+                  :action (lambda (_widget &optional _event)
                             (call-interactively 'custom-theme-add-face)))
 
     ;; If THEME is non-nil, insert all of that theme's variables.
@@ -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
@@ -198,14 +201,14 @@ remove them from your saved Custom file.\n\n"))
                   :button-face 'custom-link
                   :mouse-face 'highlight
                   :pressed-face 'highlight
-                  :action (lambda (widget &optional event)
+                  :action (lambda (_widget &optional _event)
                             (call-interactively 'custom-theme-add-variable)))
     (widget-insert ?\n)
     (widget-setup)
     (goto-char (point-min))
     (message "")))
 
-(defun custom-theme-revert (ignore-auto noconfirm)
+(defun custom-theme-revert (_ignore-auto noconfirm)
   (when (or noconfirm (y-or-n-p "Discard current changes? "))
     (customize-create-theme custom-theme--save-name (current-buffer))))
 
@@ -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: "
@@ -332,7 +336,11 @@ SPEC, if non-nil, should be a face spec to which to set the widget."
               (nth 3 setting))))
   theme)
 
-(defun custom-theme-write (&rest ignore)
+;; From cus-edit.el
+(defvar custom-reset-standard-faces-list)
+(defvar custom-reset-standard-variables-list)
+
+(defun custom-theme-write (&rest _ignore)
   "Write the current custom theme to its theme file."
   (interactive)
   (let* ((name (widget-value custom-theme-name))
@@ -529,7 +537,7 @@ Do not call this mode function yourself.  It is meant for internal use."
   (use-local-map custom-theme-choose-mode-map)
   (custom--initialize-widget-variables)
   (set (make-local-variable 'revert-buffer-function)
-       (lambda (ignore-auto noconfirm)
+       (lambda (_ignore-auto noconfirm)
         (when (or noconfirm (y-or-n-p "Discard current choices? "))
           (customize-themes (current-buffer))))))
 (put 'custom-theme-choose-mode 'mode-class 'special)
@@ -562,7 +570,7 @@ Theme files are named *-theme.el in `"))
                 :help-echo "Describe `custom-theme-load-path'."
                 :keymap custom-mode-link-map
                 :follow-link 'mouse-face
-                :action (lambda (widget &rest ignore)
+                :action (lambda (_widget &rest _ignore)
                           (describe-variable 'custom-theme-load-path)))
   (widget-insert "'.\n\n")
 
@@ -585,7 +593,7 @@ Theme files are named *-theme.el in `"))
                     :help-echo "Migrate."
                     :keymap custom-mode-link-map
                     :follow-link 'mouse-face
-                    :action (lambda (widget &rest ignore)
+                    :action (lambda (_widget &rest _ignore)
                               (customize-create-theme 'user)))
       (widget-insert ".\n\n")))
 
@@ -621,7 +629,9 @@ Theme files are named *-theme.el in `"))
   (let ((this-theme (widget-get widget :theme-name)))
     (if (widget-value widget)
        ;; Disable the theme.
-       (disable-theme this-theme)
+       (progn
+         (disable-theme this-theme)
+         (widget-toggle-action widget event))
       ;; Enable the theme.
       (unless custom-theme-allow-multiple-selections
        ;; If only one theme is allowed, disable all other themes and
@@ -634,12 +644,11 @@ Theme files are named *-theme.el in `"))
          (unless (eq (car theme) this-theme)
            (widget-value-set (cdr theme) nil)
            (widget-apply (cdr theme) :notify (cdr theme) event))))
-      (load-theme this-theme)))
-  ;; Mark `custom-enabled-themes' as "set for current session".
-  (put 'custom-enabled-themes 'customized-value
-       (list (custom-quote custom-enabled-themes)))
-  ;; Check/uncheck the widget.
-  (widget-toggle-action widget event))
+      (when (load-theme this-theme)
+       (widget-toggle-action widget event)))
+    ;; Mark `custom-enabled-themes' as "set for current session".
+    (put 'custom-enabled-themes 'customized-value
+        (list (custom-quote custom-enabled-themes)))))
 
 (defun custom-describe-theme ()
   "Describe the Custom theme on the current line."
@@ -648,7 +657,7 @@ Theme files are named *-theme.el in `"))
     (and widget
         (describe-theme (widget-get widget :theme-name)))))
 
-(defun custom-theme-save (&rest ignore)
+(defun custom-theme-save (&rest _ignore)
   (interactive)
   (customize-save-variable 'custom-enabled-themes custom-enabled-themes)
   (message "Custom themes saved for future sessions."))
@@ -662,4 +671,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