diff lisp/prim/faces.el @ 26:441bb1e64a06 r19-15b96

Import from CVS: tag r19-15b96
author cvs
date Mon, 13 Aug 2007 08:51:32 +0200
parents 4103f0995bd7
children 1917ad0d78d7
line wrap: on
line diff
--- a/lisp/prim/faces.el	Mon Aug 13 08:51:05 2007 +0200
+++ b/lisp/prim/faces.el	Mon Aug 13 08:51:32 2007 +0200
@@ -1270,11 +1270,10 @@
 
   ;; first time through, set the zmacs-region color if it's not already
   ;; specified.
-  (if (and (not (face-differs-from-default-p 'zmacs-region device))
-	   (not (face-background 'zmacs-region 'global)))
-      (progn
-	(set-face-background 'zmacs-region "gray" 'global 'color)
-	(set-face-background 'zmacs-region "gray80" 'global 'grayscale)))
+  (unless (or (face-differs-from-default-p 'zmacs-region device)
+	      (face-background 'zmacs-region 'global))
+    (set-face-background 'zmacs-region "gray65" 'global 'color)
+    (set-face-background 'zmacs-region "gray65" 'global 'grayscale))
   (if (and (not (face-differs-from-default-p 'zmacs-region device))
 	   (not (face-background-pixmap 'zmacs-region 'global)))
       (progn
@@ -1307,11 +1306,10 @@
 
   ;; first time through, set the primary-selection color if it's not already
   ;; specified.
-  (if (and (not (face-differs-from-default-p 'primary-selection device))
-	   (not (face-background 'primary-selection 'global)))
-      (progn
-	(set-face-background 'primary-selection "gray" 'global 'color)
-	(set-face-background 'primary-selection "gray80" 'global 'grayscale)))
+  (unless (or (face-differs-from-default-p 'primary-selection device)
+	      (face-background 'primary-selection 'global))
+    (set-face-background 'primary-selection "gray65" 'global 'color)
+    (set-face-background 'primary-selection "gray65" 'global 'grayscale))
   (if (and (not (face-differs-from-default-p 'secondary-selection device))
 	   (not (face-background-pixmap 'primary-selection 'global)))
       (set-face-background-pixmap 'primary-selection "gray3" 'global 'mono))