* cus-edit.el (custom-button-mouse): New variable.

	(custom-button-mouse): New face.
	(custom-raised-buttons, custom-mode): Use it.

	* cus-theme.el (custom-new-theme-mode): Use custom-button-mouse.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5a50955a2e389d85af69ea8bb086ff1efde1fd10..a77b88ff05d139f0657c185959be3c7307b20549 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2005-12-31  Chong Yidong  <cyd@stupidchicken.com>
+
+       * cus-edit.el (custom-button-mouse): New variable.
+       (custom-button-mouse): New face.
+       (custom-raised-buttons, custom-mode): Use it.
+
+       * cus-theme.el (custom-new-theme-mode): Use custom-button-mouse.
+
 2005-12-31  Eli Zaretskii  <eliz@gnu.org>
 
        * progmodes/gud.el (gud-display-line): Support hl-line in the

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index ed0a478321eca17ef0a372a1d202085da819a425..6beaa5f65ecd1194de16425aab6a1e01fa9e61f0 100644 (file)
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1405,6 +1405,9 @@ This button will have a menu with all three reset operations."
 (defvar custom-button nil
   "Face used for buttons in customization buffers.")
 
+(defvar custom-button-mouse nil
+  "Mouse face used for buttons in customization buffers.")
+
 (defvar custom-button-pressed nil
   "Face used for pressed buttons in customization buffers.")
 
@@ -1419,6 +1422,8 @@ Otherwise use brackets."
         (custom-set-default variable value)
         (setq custom-button
               (if value 'custom-button 'custom-button-unraised))
+        (setq custom-button-mouse
+              (if value 'custom-button-mouse 'highlight))
         (setq custom-button-pressed
               (if value
                   'custom-button-pressed
@@ -1960,6 +1965,16 @@ and `face'."
 ;; backward-compatibility alias
 (put 'custom-button-face 'face-alias 'custom-button)
 
+(defface custom-button-mouse
+  '((((type x w32 mac) (class color))
+     (:box (:line-width 2 :style released-button)
+          :background "grey90" :foreground "black"))
+    (t
+     nil))
+  "Mouse face for custom buffer buttons if `custom-raised-buttons' is non-nil."
+  :version "22.1"
+  :group 'custom-faces)
+
 (defface custom-button-unraised
   '((((min-colors 88)
       (class color) (background light)) :foreground "blue1" :underline t)
@@ -1975,6 +1990,9 @@ and `face'."
 (setq custom-button
       (if custom-raised-buttons 'custom-button 'custom-button-unraised))
 
+(setq custom-button-mouse
+      (if custom-raised-buttons 'custom-button-mouse 'highlight))
+
 (defface custom-button-pressed
   '((((type x w32 mac) (class color))
      (:box (:line-width 2 :style pressed-button)
@@ -4407,8 +4425,7 @@ if that value is non-nil."
   (make-local-variable 'widget-button-face)
   (setq widget-button-face custom-button)
   (set (make-local-variable 'widget-button-pressed-face) custom-button-pressed)
-  (if custom-raised-buttons
-      (set (make-local-variable 'widget-mouse-face) custom-button))
+  (set (make-local-variable 'widget-mouse-face) custom-button-mouse)
 
   ;; When possible, use relief for buttons, not bracketing.  This test
   ;; may not be optimal.

diff --git a/lisp/cus-theme.el b/lisp/cus-theme.el
index cc5890678a8bfabd06c6e17053715a401c5a3259..d7102fc11f7be31f5ed0ea3eec539eae1050b398 100644 (file)
--- a/lisp/cus-theme.el
+++ b/lisp/cus-theme.el
@@ -50,8 +50,7 @@ use by `customize-create-theme'."
   (set (make-local-variable 'widget-documentation-face) 'custom-documentation)
   (set (make-local-variable 'widget-button-face) custom-button)
   (set (make-local-variable 'widget-button-pressed-face) custom-button-pressed)
-  (if custom-raised-buttons
-      (set (make-local-variable 'widget-mouse-face) custom-button))
+  (set (make-local-variable 'widget-mouse-face) custom-button-mouse)
   (when custom-raised-buttons
     (set (make-local-variable 'widget-push-button-prefix) "")
     (set (make-local-variable 'widget-push-button-suffix) "")