From xemacs-m  Fri Feb  7 19:06:48 1997
Received: from altair.xemacs.org (steve@xemacs.miranova.com [206.190.83.19])
	by xemacs.org (8.8.5/8.8.5) with ESMTP id TAA14366
	for <xemacs-beta@xemacs.org>; Fri, 7 Feb 1997 19:06:47 -0600 (CST)
Received: (from steve@localhost)
	by altair.xemacs.org (8.8.5/8.8.5) id RAA28614;
	Fri, 7 Feb 1997 17:17:51 -0800
To: xemacs-beta@xemacs.org
Cc: Jacques Duthen <duthen@club-internet.fr>
Subject: Re: [19.15-b92] ps-print lossage
References: <vkn2tjp1ki.fsf@cdc.noaa.gov> 	<m2ohdy8l0u.fsf@altair.xemacs.org> <QQcbxf20614.199702071952@crystal.WonderWorks.COM> <vkraiswd0c.fsf@cdc.noaa.gov> <vkn2tgw71y.fsf@cdc.noaa.gov>
X-Url: http://www.miranova.com/%7Esteve/
Mail-Copies-To: never
X-Face: #!T9!#9s-3o8)*uHlX{Ug[xW7E7Wr!*L46-OxqMu\xz23v|R9q}lH?cRS{rCNe^'[`^sr5"
 f8*@r4ipO6Jl!:Ccq<xoV[Qz2u8<8-+Vwf2gzJ44lf_/y9OaQ`@#Q65{U4/TC)i2`~/M&QI$X>p:9I
 OSS'2{-)-4wBnVeg0S\O4Al@)uC[pD|+
X-Attribution: sb
From: Steven L Baur <steve@miranova.com>
In-Reply-To: Mark Borges's message of 07 Feb 1997 16:05:45 -0700
Mime-Version: 1.0 (generated by tm-edit 7.101)
Content-Type: text/plain; charset=US-ASCII
Date: 07 Feb 1997 17:17:48 -0800
Message-ID: <m2lo909jur.fsf@altair.xemacs.org>
Lines: 49
X-Mailer: Gnus v5.4.11/XEmacs 20.0

Crap.  My previous patch is wrong.  This is the correct one.

Somebody please test this on a monochrome system.

Index: ps-print.el
===================================================================
RCS file: /usr/local/xemacs/xemacs-20.0/lisp/packages/ps-print.el,v
retrieving revision 1.3
diff -u -r1.3 ps-print.el
--- ps-print.el	1997/02/02 02:16:13	1.3
+++ ps-print.el	1997/02/08 01:11:06
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1993, 1994, 1995, 1996 Free Software Foundation, Inc.
 
 ;; Author:     Jim Thompson (was <thompson@wg2.waii.com>)
-;; Maintainer: Jacques Duthen <duthen@cegelec-red.fr>
+;; Maintainer: Jacques Duthen <duthen@club-internet.fr>
 ;; Keywords:   print, PostScript
 ;; Time-stamp: <97/01/29 23:21:25 tjchol01>
 ;; Version:    3.05
@@ -2445,15 +2445,16 @@
   (/ x-color-value ps-print-color-scale))
 
 (defun ps-color-values (x-color)
-  (cond ((fboundp 'x-color-values)
+  (cond ((fboundp 'color-instance-rgb-components)
+	 (if (ps-color-device)
+	     (color-instance-rgb-components
+	      (if (color-instance-p x-color) x-color
+		(if (color-specifier-p x-color)
+		    (make-color-instance (color-name x-color))
+		  (make-color-instance x-color))))
+	   (error "No available function to determine X color values.")))
+	((fboundp 'x-color-values)
 	 (x-color-values x-color))
-	((and (fboundp 'color-instance-rgb-components)
-	      (ps-color-device))
-	 (color-instance-rgb-components
-	  (if (color-instance-p x-color) x-color
-	    (if (color-specifier-p x-color)
-		(make-color-instance (color-name x-color))
-	      (make-color-instance x-color)))))
 	(t (error "No available function to determine X color values."))))
 
 (defun ps-face-attributes (face)

-- 
steve@miranova.com baur
Unsolicited commercial e-mail will be billed at $250/message.

