From: Vinicius Jose Latorre <viniciusjl@ig.com.br>
Date: Wed, 8 Aug 2007 16:37:46 +0000 (+0000)
Subject: ps-print-color-p fix
X-Git-Tag: emacs-pretest-22.1.90~1036
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ea1711904fd349350ae115269d0fb0e611b45dd9;p=emacs.git

ps-print-color-p fix
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 24d83794eac..fe3b90d5100 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-08  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+	* ps-print.el (ps-default-fg, ps-default-bg): Docstring fix.
+	(ps-begin-job): Use ps-default-fg and ps-default-bg only when
+	ps-print-color-p is neither nil nor black-white.  Reported by Christian
+	Schlauer <cs-muelleimer-rubbish.bin@arcor.de>.
+
 2007-08-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* files.el (auto-mode-alist): Use the purecopied text (duh!).
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index a2346b8f76b..4f5f67fd91e 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -3016,7 +3016,8 @@ Valid values are:
 
 Any other value is ignored and black color will be used.
 
-It's used only when `ps-print-color-p' is non-nil."
+This variable is used only when `ps-print-color-p' (which see) is neither nil
+nor black-white."
   :type '(choice :menu-tag "Default Foreground Gray/Color"
 		 :tag "Default Foreground Gray/Color"
 		 (const :tag "Session Foreground" t)
@@ -3059,7 +3060,8 @@ Valid values are:
 
 Any other value is ignored and white color will be used.
 
-It's used only when `ps-print-color-p' is non-nil.
+This variable is used only when `ps-print-color-p' (which see) is neither nil
+nor black-white.
 
 See also `ps-use-face-background'."
   :type '(choice :menu-tag "Default Background Gray/Color"
@@ -5920,7 +5922,8 @@ XSTART YSTART are the relative position for the first page in a sheet.")
 				1.0)
 	ps-default-background (ps-rgb-color
 			       (cond
-				((or (not (eq ps-print-color-p t))
+				((or (member ps-print-color-p
+					     '(nil back-white))
 				     (eq genfunc 'ps-generate-postscript))
 				 nil)
 				((eq ps-default-bg 'frame-parameter)
@@ -5933,7 +5936,8 @@ XSTART YSTART are the relative position for the first page in a sheet.")
 			       1.0)
 	ps-default-foreground (ps-rgb-color
 			       (cond
-				((or (not (eq ps-print-color-p t))
+				((or (member ps-print-color-p
+					     '(nil back-white))
 				     (eq genfunc 'ps-generate-postscript))
 				 nil)
 				((eq ps-default-fg 'frame-parameter)
@@ -5944,7 +5948,8 @@ XSTART YSTART are the relative position for the first page in a sheet.")
 				 ps-default-fg))
 			       "unspecified-fg"
 			       0.0)
-	ps-default-color      (and (eq ps-print-color-p t)
+	ps-default-color      (and (not (member ps-print-color-p
+						'(nil back-white)))
 				   ps-default-foreground)
 	ps-current-color      ps-default-color)
   ;; initialize page dimensions