Mercurial > emacs

changeset 91004:f72cf5b2ab11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ps-print-color-p fix
author Vinicius Jose Latorre <viniciusjl@ig.com.br>
date Wed, 08 Aug 2007 16:39:00 +0000
parents 2e0d11dc863d
children 424b655804ca
files lisp/ChangeLog lisp/ps-print.el
diffstat 2 files changed, 17 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Mon Aug 06 12:36:07 2007 +0000
+++ b/lisp/ChangeLog	Wed Aug 08 16:39:00 2007 +0000
@@ -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-06  Vinicius Jose Latorre  <viniciusig@ig.com.br>
 
 	* printing.el: Require lpr and ps-print when loading printing package.
--- a/lisp/ps-print.el	Mon Aug 06 12:36:07 2007 +0000
+++ b/lisp/ps-print.el	Wed Aug 08 16:39:00 2007 +0000
@@ -2952,7 +2952,8 @@
 
 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)
@@ -2995,7 +2996,8 @@
 
 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"
@@ -5707,7 +5709,8 @@
 				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)
@@ -5720,7 +5723,8 @@
 			       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)
@@ -5731,7 +5735,8 @@
 				 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
 	;; Set up default functions.  They may be overridden by