If ps-lpr-switches is not a list, force it to be one.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c14a7e94e4ac58f8e537d45e83796968c147ff0e..ef1ec9f20fa125d151def1ce1e5ebd21e8987d5d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-09  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+       * ps-print.el (ps-do-despool): If ps-lpr-switches is not a list, force
+       it to be one.
+       (ps-print-version): New version 6.8.1.
+
 2007-11-09  Juanma Barranquero  <lekktu@gmail.com>
 
        * files.el (enable-local-variables): Doc fix.
@@ -6319,18 +6325,6 @@
        Replace it with another one which disables undo before calling
        erase-buffer and then turns it back on if needed.
 
-2007-07-24  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
-
-       * ps-print.el: Problem with foreground and background color when
-       printing a buffer with and without faces.  Reported by Christian
-       Schlauer <cs-muelleimer-rubbish.bin@arcor.de>.
-       (ps-print-version): New version 6.7.5.
-       (ps-default-fg): Change default value to nil, so black color is used
-       when a face does not specify a foreground color.
-       (ps-default-bg): Change default value to nil, so white color is used
-       for background color.
-       (ps-begin-job): Fix code.
-
 2007-07-24  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * vc-hg.el (vc-hg-revision-completion-table): Temporarily comment out.

diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index d15d5879d69c4a10ca170b6399c7baa79bd19929..ecd5488f9dcbb1b8550380eb5befb0d92b045da7 100644 (file)
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -10,11 +10,11 @@
 ;; Maintainer: Kenichi Handa <handa@m17n.org> (multi-byte characters)
 ;;     Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Keywords: wp, print, PostScript
-;; Version: 6.8
+;; Version: 6.8.1
 ;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
 
-(defconst ps-print-version "6.8"
-  "ps-print.el, v 6.8 <2007/10/26 vinicius>
+(defconst ps-print-version "6.8.1"
+  "ps-print.el, v 6.8.1 <2007/11/09 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
@@ -6844,7 +6844,9 @@ If FACE is not a valid face name, use default face."
                                    (and (boundp 'printer-name)
                                         (symbol-value 'printer-name))))
               (ps-lpr-switches
-               (append ps-lpr-switches
+               (append (if (listp ps-lpr-switches)
+                           ps-lpr-switches
+                         (list ps-lpr-switches))
                        (and (stringp ps-printer-name)
                             (string< "" ps-printer-name)
                             (list (concat