[Emacs-diffs] Changes to emacs/lisp/ps-print.el,v

[Vinicius Jose Latorre]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Vinicius Jose Latorre <viniciusjl>      07/02/07 13:40:10

Index: ps-print.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ps-print.el,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -b -r1.174 -r1.175
--- ps-print.el 29 Jan 2007 16:11:48 -0000      1.174
+++ ps-print.el 7 Feb 2007 13:40:10 -0000       1.175
@@ -10,11 +10,11 @@
 ;; Maintainer: Kenichi Handa <address@hidden> (multi-byte characters)
 ;;     Vinicius Jose Latorre <address@hidden>
 ;; Keywords: wp, print, PostScript
-;; Version: 6.7.2
+;; Version: 6.7.3
 ;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
 
-(defconst ps-print-version "6.7.2"
-  "ps-print.el, v 6.7.2 <2007/01/26 vinicius>
+(defconst ps-print-version "6.7.3"
+  "ps-print.el, v 6.7.3 <2007/02/06 vinicius>
 
 Vinicius's last change version -- this file may have been edited as part of
 Emacs without changes to the version number.  When reporting bugs, please also
@@ -5838,7 +5838,7 @@
        ))
 
 
-(defun ps-begin-job ()
+(defun ps-begin-job (genfunc)
   ;; prologue files
   (or (equal ps-mark-code-directory ps-postscript-code-directory)
       (setq ps-print-prologue-0    (ps-prologue-file 0)
@@ -5909,6 +5909,8 @@
              (t "[\t\n\f]"))
        ps-default-background (ps-rgb-color
                               (cond
+                               ((eq genfunc 'ps-generate-postscript)
+                                nil)
                                ((eq ps-default-bg 'frame-parameter)
                                 (ps-frame-parameter 'background-color))
                                ((eq ps-default-bg t)
@@ -5918,6 +5920,8 @@
                               1.0)
        ps-default-foreground (ps-rgb-color
                               (cond
+                               ((eq genfunc 'ps-generate-postscript)
+                                nil)
                                ((eq ps-default-fg 'frame-parameter)
                                 (ps-frame-parameter 'foreground-color))
                                ((eq ps-default-fg t)
@@ -6321,7 +6325,7 @@
 `ps-print-face-alist', insert it on `ps-print-face-alist' and
 return the attribute vector.
 
-If FACE is not a valid face name, it is used default face."
+If FACE is not a valid face name, use default face."
   (cond
    (ps-black-white-faces-alist
     (or (and (symbolp face)
@@ -6346,8 +6350,10 @@
 
 
 (defun ps-face-background (face background)
-  (and (or (eq ps-use-face-background t)
-          (cond ((symbolp face)
+  (and (cond ((eq ps-use-face-background t))   ; always
+            ((null ps-use-face-background) nil) ; never
+            ;; ps-user-face-background is a symbol face list
+            ((symbolp face)
                  (memq face ps-use-face-background))
                 ((listp face)
                  (or (memq (car face) '(foreground-color background-color))
@@ -6362,7 +6368,7 @@
                        ok)))
                 (t
                  nil)
-                ))
+            )
        background))
 
 
@@ -6629,7 +6635,7 @@
       (ps-plot-with-face from to face))))
 
 (defun ps-generate-postscript (from to)
-  (ps-plot-region from to 0 nil))
+  (ps-plot-region from to 0))
 
 (defun ps-generate (buffer from to genfunc)
   (save-excursion
@@ -6665,7 +6671,7 @@
                (save-excursion
                  (let ((ps-print-page-p t)
                        ps-even-or-odd-pages)
-                   (ps-begin-job)
+                   (ps-begin-job genfunc)
                    (when needs-begin-file
                      (ps-begin-file)
                      (ps-mule-initialize))