aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2005-12-31 16:26:01 +0000
committerChong Yidong2005-12-31 16:26:01 +0000
commit85a5eb0eb08f43513f0863835d790b4eb5d9efa1 (patch)
tree80bfd510ee39734abc8bb0ca8f645ebabdcaedad
parentcdda1b59668b5362c19c8d95b01bd42ec333d6be (diff)
downloademacs-85a5eb0eb08f43513f0863835d790b4eb5d9efa1.tar.gz
emacs-85a5eb0eb08f43513f0863835d790b4eb5d9efa1.zip
* 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.
-rw-r--r--lisp/ChangeLog8
-rw-r--r--lisp/cus-edit.el21
-rw-r--r--lisp/cus-theme.el3
3 files changed, 28 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5a50955a2e3..a77b88ff05d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
12005-12-31 Chong Yidong <cyd@stupidchicken.com>
2
3 * cus-edit.el (custom-button-mouse): New variable.
4 (custom-button-mouse): New face.
5 (custom-raised-buttons, custom-mode): Use it.
6
7 * cus-theme.el (custom-new-theme-mode): Use custom-button-mouse.
8
12005-12-31 Eli Zaretskii <eliz@gnu.org> 92005-12-31 Eli Zaretskii <eliz@gnu.org>
2 10
3 * progmodes/gud.el (gud-display-line): Support hl-line in the 11 * progmodes/gud.el (gud-display-line): Support hl-line in the
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index ed0a478321e..6beaa5f65ec 100644
--- 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."
1405(defvar custom-button nil 1405(defvar custom-button nil
1406 "Face used for buttons in customization buffers.") 1406 "Face used for buttons in customization buffers.")
1407 1407
1408(defvar custom-button-mouse nil
1409 "Mouse face used for buttons in customization buffers.")
1410
1408(defvar custom-button-pressed nil 1411(defvar custom-button-pressed nil
1409 "Face used for pressed buttons in customization buffers.") 1412 "Face used for pressed buttons in customization buffers.")
1410 1413
@@ -1419,6 +1422,8 @@ Otherwise use brackets."
1419 (custom-set-default variable value) 1422 (custom-set-default variable value)
1420 (setq custom-button 1423 (setq custom-button
1421 (if value 'custom-button 'custom-button-unraised)) 1424 (if value 'custom-button 'custom-button-unraised))
1425 (setq custom-button-mouse
1426 (if value 'custom-button-mouse 'highlight))
1422 (setq custom-button-pressed 1427 (setq custom-button-pressed
1423 (if value 1428 (if value
1424 'custom-button-pressed 1429 'custom-button-pressed
@@ -1960,6 +1965,16 @@ and `face'."
1960;; backward-compatibility alias 1965;; backward-compatibility alias
1961(put 'custom-button-face 'face-alias 'custom-button) 1966(put 'custom-button-face 'face-alias 'custom-button)
1962 1967
1968(defface custom-button-mouse
1969 '((((type x w32 mac) (class color))
1970 (:box (:line-width 2 :style released-button)
1971 :background "grey90" :foreground "black"))
1972 (t
1973 nil))
1974 "Mouse face for custom buffer buttons if `custom-raised-buttons' is non-nil."
1975 :version "22.1"
1976 :group 'custom-faces)
1977
1963(defface custom-button-unraised 1978(defface custom-button-unraised
1964 '((((min-colors 88) 1979 '((((min-colors 88)
1965 (class color) (background light)) :foreground "blue1" :underline t) 1980 (class color) (background light)) :foreground "blue1" :underline t)
@@ -1975,6 +1990,9 @@ and `face'."
1975(setq custom-button 1990(setq custom-button
1976 (if custom-raised-buttons 'custom-button 'custom-button-unraised)) 1991 (if custom-raised-buttons 'custom-button 'custom-button-unraised))
1977 1992
1993(setq custom-button-mouse
1994 (if custom-raised-buttons 'custom-button-mouse 'highlight))
1995
1978(defface custom-button-pressed 1996(defface custom-button-pressed
1979 '((((type x w32 mac) (class color)) 1997 '((((type x w32 mac) (class color))
1980 (:box (:line-width 2 :style pressed-button) 1998 (:box (:line-width 2 :style pressed-button)
@@ -4407,8 +4425,7 @@ if that value is non-nil."
4407 (make-local-variable 'widget-button-face) 4425 (make-local-variable 'widget-button-face)
4408 (setq widget-button-face custom-button) 4426 (setq widget-button-face custom-button)
4409 (set (make-local-variable 'widget-button-pressed-face) custom-button-pressed) 4427 (set (make-local-variable 'widget-button-pressed-face) custom-button-pressed)
4410 (if custom-raised-buttons 4428 (set (make-local-variable 'widget-mouse-face) custom-button-mouse)
4411 (set (make-local-variable 'widget-mouse-face) custom-button))
4412 4429
4413 ;; When possible, use relief for buttons, not bracketing. This test 4430 ;; When possible, use relief for buttons, not bracketing. This test
4414 ;; may not be optimal. 4431 ;; may not be optimal.
diff --git a/lisp/cus-theme.el b/lisp/cus-theme.el
index cc5890678a8..d7102fc11f7 100644
--- a/lisp/cus-theme.el
+++ b/lisp/cus-theme.el
@@ -50,8 +50,7 @@ use by `customize-create-theme'."
50 (set (make-local-variable 'widget-documentation-face) 'custom-documentation) 50 (set (make-local-variable 'widget-documentation-face) 'custom-documentation)
51 (set (make-local-variable 'widget-button-face) custom-button) 51 (set (make-local-variable 'widget-button-face) custom-button)
52 (set (make-local-variable 'widget-button-pressed-face) custom-button-pressed) 52 (set (make-local-variable 'widget-button-pressed-face) custom-button-pressed)
53 (if custom-raised-buttons 53 (set (make-local-variable 'widget-mouse-face) custom-button-mouse)
54 (set (make-local-variable 'widget-mouse-face) custom-button))
55 (when custom-raised-buttons 54 (when custom-raised-buttons
56 (set (make-local-variable 'widget-push-button-prefix) "") 55 (set (make-local-variable 'widget-push-button-prefix) "")
57 (set (make-local-variable 'widget-push-button-suffix) "") 56 (set (make-local-variable 'widget-push-button-suffix) "")