From d3509e50815052654e5ced830f898a9aed211308 Mon Sep 17 00:00:00 2001 From: Vinicius Jose Latorre Date: Wed, 8 Aug 2007 16:38:32 +0000 Subject: [PATCH] ps-print-color-p fix --- lisp/ChangeLog | 7 +++++++ lisp/ps-print.el | 15 ++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9b8a5fedbee..3491f9f5df7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2007-08-08 Vinicius Jose Latorre + + * 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 . + 2007-08-08 Andreas Schwab * mail/mailabbrev.el (sendmail-pre-abbrev-expand-hook): Check for diff --git a/lisp/ps-print.el b/lisp/ps-print.el index 3526c170e1f..f7abe472fe5 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 -- 2.39.2