bug#24308: 25.1.50; Fix back-white <-> black-white typo

bug#24308: 25.1.50; Fix back-white <-> black-white typo

[Kaushal Modi]

[-- Attachment #1: Type: text/plain, Size: 1457 bytes --]

This bug affects printing post-scripts in black and white.

From the documentation of ps-default-fs and ps-default-bg, we get:

> This variable is used only when `ps-print-color-p' (which see) is neither
nil
> nor black-white.

That does not match with the code .. these values affect the postscript
export even when ps-print-color-p is set to 'black-white.

On reviewing the code, the bug was that black-white was written as
back-white (note the typo).

I'll attach the patch in a followup email.

In GNU Emacs 25.1.50.36 (x86_64-unknown-linux-gnu, GTK+ Version 2.24.23)
 of 2016-08-24
Repository revision: 70cfe9df957bd2f0699f62fe5e69176313f7c8f0
Windowing system distributor 'The X.Org Foundation', version 11.0.60900000
System Description: Red Hat Enterprise Linux Workstation release 6.6
(Santiago)


Configured using:
 'configure --with-modules
 --prefix=/home/kmodi/usr_local/apps/6/emacs/master
 'CPPFLAGS=-fgnu89-inline -I/home/kmodi/usr_local/6/include
 -I/usr/include/freetype2 -I/usr/include' 'CFLAGS=-ggdb3 -O0'
 'CXXFLAGS=-ggdb3 -O0' 'LDFLAGS=-L/home/kmodi/usr_local/6/lib
 -L/home/kmodi/usr_local/6/lib64 -ggdb3''

Configured features:
XPM JPEG TIFF GIF PNG RSVG IMAGEMAGICK SOUND GPM DBUS GCONF GSETTINGS
NOTIFY ACL LIBSELINUX GNUTLS LIBXML2 FREETYPE LIBOTF XFT ZLIB
TOOLKIT_SCROLL_BARS GTK2 X11 MODULES

Important settings:
  value of $LANG: en_US.UTF-8
  value of $XMODIFIERS: @im=none
  locale-coding-system: utf-8-unix
-- 

Kaushal Modi

[-- Attachment #2: Type: text/html, Size: 2223 bytes --]

bug#24308: 25.1.50; Fix back-white <-> black-white typo

[Kaushal Modi]

[-- Attachment #1: Type: text/plain, Size: 1612 bytes --]

Patch to fix this bug:

Can you please commit this patch as I do not have commit rights. Thanks.

From f34a420b3b02eeaf816afb793875e2893fcf411c Mon Sep 17 00:00:00 2001
From: Kaushal Modi <kaushal.modi@gmail.com>
Date: Thu, 25 Aug 2016 11:06:45 -0400
Subject: [PATCH] Fix back-white <-> black-white typo

* lisp/ps-print.el (ps-begin-job): back-white -> black-white (Bug#24308)
---
 lisp/ps-print.el | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 2ea0919..54ffe28 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -5828,7 +5828,7 @@ ps-begin-job
  ps-default-background (ps-rgb-color
        (cond
  ((or (member ps-print-color-p
-     '(nil back-white))
+     '(nil black-white))
      (eq genfunc 'ps-generate-postscript))
  nil)
  ((eq ps-default-bg 'frame-parameter)
@@ -5842,7 +5842,7 @@ ps-begin-job
  ps-default-foreground (ps-rgb-color
        (cond
  ((or (member ps-print-color-p
-     '(nil back-white))
+     '(nil black-white))
      (eq genfunc 'ps-generate-postscript))
  nil)
  ((eq ps-default-fg 'frame-parameter)
@@ -5857,12 +5857,12 @@ ps-begin-job
        #'(lambda (arg)
    (ps-rgb-color arg "unspecified-fg" 0.0))
        (append (and (not (member ps-print-color-p
- '(nil back-white)))
+ '(nil black-white)))
     ps-fg-list)
        (list ps-default-foreground
      "black")))
  ps-default-color      (and (not (member ps-print-color-p
- '(nil back-white)))
+ '(nil black-white)))
    ps-default-foreground)
  ps-current-color      ps-default-color
  ;; Set up default functions.
-- 
2.9.2

-- 

Kaushal Modi

[-- Attachment #2: Type: text/html, Size: 4402 bytes --]

bug#24308: 25.1.50; Fix back-white <-> black-white typo

[npostavs]

Kaushal Modi <kaushal.modi@gmail.com> writes:

> Patch to fix this bug:
>
> Can you please commit this patch as I do not have commit
> rights. Thanks.

The patch doesn't apply, it seems to be missing indentation, can you
resend (maybe as attachment to avoid mangling)?

bug#24308: 25.1.50; Fix back-white <-> black-white typo

[Kaushal Modi]

[-- Attachment #1.1.1: Type: text/plain, Size: 617 bytes --]

On Mon, Sep 5, 2016 at 7:22 PM <npostavs@users.sourceforge.net> wrote:

> Kaushal Modi <kaushal.modi@gmail.com> writes:
>
> The patch doesn't apply, it seems to be missing indentation, can you
> resend (maybe as attachment to avoid mangling)?
>

Thanks for the attempt to commit my patch. Can you please try the attached
version (It's the same as the one I had pasted inline earlier.).

I had ensured that I retained tabs and whitespaces as they were. That code
is a mess as it uses tabs on some lines and white spaces on some (the
yellows are the tabs in the below screenshot.. )

[image: pasted1]
-- 

Kaushal Modi

[-- Attachment #1.1.2: Type: text/html, Size: 1212 bytes --]

[-- Attachment #1.2: pasted1 --]
[-- Type: image/png, Size: 136292 bytes --]

[-- Attachment #2: 0001-Fix-back-white-black-white-typo.patch --]
[-- Type: application/octet-stream, Size: 1602 bytes --]

From f34a420b3b02eeaf816afb793875e2893fcf411c Mon Sep 17 00:00:00 2001
From: Kaushal Modi <kaushal.modi@gmail.com>
Date: Thu, 25 Aug 2016 11:06:45 -0400
Subject: [PATCH] Fix back-white <-> black-white typo

* lisp/ps-print.el (ps-begin-job): back-white -> black-white (Bug#24308)
---
 lisp/ps-print.el | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 2ea0919..54ffe28 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -5828,7 +5828,7 @@ ps-begin-job
 	ps-default-background (ps-rgb-color
 			       (cond
 				((or (member ps-print-color-p
-					     '(nil back-white))
+					     '(nil black-white))
 				     (eq genfunc 'ps-generate-postscript))
 				 nil)
 				((eq ps-default-bg 'frame-parameter)
@@ -5842,7 +5842,7 @@ ps-begin-job
 	ps-default-foreground (ps-rgb-color
 			       (cond
 				((or (member ps-print-color-p
-					     '(nil back-white))
+					     '(nil black-white))
 				     (eq genfunc 'ps-generate-postscript))
 				 nil)
 				((eq ps-default-fg 'frame-parameter)
@@ -5857,12 +5857,12 @@ ps-begin-job
 			       #'(lambda (arg)
 				   (ps-rgb-color arg "unspecified-fg" 0.0))
 			       (append (and (not (member ps-print-color-p
-							 '(nil back-white)))
+							 '(nil black-white)))
 					    ps-fg-list)
 				       (list ps-default-foreground
 					     "black")))
 	ps-default-color      (and (not (member ps-print-color-p
-						'(nil back-white)))
+						'(nil black-white)))
 				   ps-default-foreground)
 	ps-current-color      ps-default-color
 	;; Set up default functions.
-- 
2.9.2

bug#24308: 25.1.50; Fix back-white <-> black-white typo

[npostavs]

tags 24308 fixed
close 24308 25.2
quit

Kaushal Modi <kaushal.modi@gmail.com> writes:

> On Mon, Sep 5, 2016 at 7:22 PM <npostavs@users.sourceforge.net> wrote:
>
> Thanks for the attempt to commit my patch. Can you please try the
> attached version (It's the same as the one I had pasted inline
> earlier.).

Thanks, push as 32078ec8