Mercurial > hg > xemacs-beta

diff lisp/faces.el @ 711:5be46355cc42

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2001-12-23 01:01:45 by wmperry] 2001-12-13 William M. Perry <wmperry@gnu.org> * gtk-faces.el (gtk-init-device-faces): Better way of munging the default faces from a style. Do not use 'device' as the locale when setting it, or it makes it very difficult for a user to override. Now munges highlight, zmacs-region, and toolbar from the appropriate information in the default GtkStyle for the device. * gui.el (gui-button-face): Ditto. * faces.el (text-cursor): (highlight): (zmacs-region): (list-mode-item-selected): (primary-selection): (secondary-selection): (isearch): (isearch-secondary): Condense old window-system specific settings into one specifier using the 'win default' tags. * dialog-gtk.el (popup-builtin-question-dialog): Deal gracefully with buttons of length 1, 2, and 3. Fixed yes-or-no-p lossage.
author wmperry
date Sun, 23 Dec 2001 01:01:46 +0000
parents a307f9a2021d
children b63242824a7a
line wrap: on
line diff
--- a/lisp/faces.el	Sat Dec 22 07:20:58 2001 +0000
+++ b/lisp/faces.el	Sun Dec 23 01:01:46 2001 +0000
@@ -1812,96 +1812,62 @@
 ;; the first non-stream device.
 
 (set-face-background 'text-cursor
-		     '(((x default) . "Red3")
-		       ((mswindows default) . "Red3"))
+		     '(((win default) . "Red3"))
 		     'global)
 
 ;; some older X servers don't recognize "darkseagreen2"
 (set-face-background 'highlight
-		     '(((x default color) . "darkseagreen2")
-		       ((x default color) . "green")
-		       ((x default grayscale) . "gray53")
-		       ((mswindows default color) . "darkseagreen2")
-		       ((mswindows default color) . "green")
-		       ((mswindows default grayscale) . "gray53"))
+		     '(((win default color) . "darkseagreen2")
+		       ((win default color) . "green")
+		       ((win default grayscale) . "gray53"))
 		     'global)
 (set-face-background-pixmap 'highlight
-			    '(((x default mono) . "gray1")
-;; 			      ((gtk default mono) . "gray1")
-			      ((mswindows default mono) . "gray1"))
+			    '(((win default mono) . "gray1"))
 			    'global)
 
 (set-face-background 'zmacs-region
-		     '(((x default color) . "gray65")
-		       ((x default grayscale) . "gray65")
-		       ((mswindows default color) . "gray65")
-		       ((mswindows default grayscale) . "gray65"))
+		     '(((win default color) . "gray65")
+		       ((win default grayscale) . "gray65"))
 		     'global)
 (set-face-background-pixmap 'zmacs-region
-			    '(((x default mono) . "gray3")
-;; 			      ((gtk default mono) . "gray3")
-			      ((mswindows default mono) . "gray3"))
+			    '(((win default mono) . "gray3"))
 			    'global)
 
 (set-face-background 'list-mode-item-selected
-		     '(((x default color) . "gray68")
-		       ((x default grayscale) . "gray68")
-		       ((x default mono) . [default foreground])
-;; 		       ((gtk default color) . "gray68")
-;; 		       ((gtk default grayscale) . "gray68")
-;; 		       ((gtk default mono) . [default foreground])
-		       ((mswindows default color) . "gray68")
-		       ((mswindows default grayscale) . "gray68")
-		       ((mswindows default mono) . [default foreground]))
+		     '(((win default color) . "gray68")
+		       ((win default grayscale) . "gray68")
+		       ((win default mono) . [default foreground]))
 		     'global)
 (set-face-foreground 'list-mode-item-selected
-		     '(((x default mono) . [default background])
-		       ((mswindows default mono) . [default background]))
+		     '(((win default mono) . [default background]))
 		     'global)
 
 (set-face-background 'primary-selection
-		     '(((x default color) . "gray65")
-		       ((x default grayscale) . "gray65")
-		       ((mswindows default color) . "gray65")
-		       ((mswindows default grayscale) . "gray65"))
+		     '(((win default color) . "gray65")
+		       ((win default grayscale) . "gray65"))
 		     'global)
 (set-face-background-pixmap 'primary-selection
-			    '(((x default mono) . "gray3")
-			      ;;((gtk default mono) . "gray3")
-			      ((mswindows default mono) . "gray3"))
+			    '(((win default mono) . "gray3"))
 			    'global)
 
 (set-face-background 'secondary-selection
-		     '(((x default color) . "paleturquoise")
-		       ((x default color) . "green")
-		       ((x default grayscale) . "gray53")
-		       ;;((gtk default color) . "paleturquoise")
-		       ;;((gtk default color) . "green")
-		       ;;((gtk default grayscale) . "gray53")
-		       ((mswindows default color) . "paleturquoise")
-		       ((mswindows default color) . "green")
-		       ((mswindows default grayscale) . "gray53"))
+		     '(((win default color) . "paleturquoise")
+		       ((win default color) . "green")
+		       ((win default grayscale) . "gray53"))
 		     'global)
 (set-face-background-pixmap 'secondary-selection
-			    '(((x default mono) . "gray1")
-			      ;;((gtk default mono) . "gray1")
-			      ((mswindows default mono) . "gray1"))
+			    '(((win default mono) . "gray1"))
 			    'global)
 
 (set-face-background 'isearch
-		     '(((x default color) . "paleturquoise")
-		       ((x default color) . "green")
-		       ;;((gtk default color) . "paleturquoise")
-		       ;;((gtk default color) . "green")
-		       ((mswindows default color) . "paleturquoise")
-		       ((mswindows default color) . "green"))
+		     '(((win default color) . "paleturquoise")
+		       ((win default color) . "green"))
 		     'global)
 
 ;; #### This should really, I mean *really*, be converted to some form
 ;; of `defface' one day.
 (set-face-foreground 'isearch-secondary
-		     '(((x default color) . "red3")
-		       ((mswindows default color) . "red3"))
+		     '(((win default color) . "red3"))
 		     'global)
 
 ;; Define some logical color names to be used when reading the pixmap files.