Error if ps-lpr-switches is not a list.

3 files changed, 16 insertions, 12 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e77106f06da..1f9ee4b748e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,13 +1,13 @@
-2007-11-10  Jason Rumney  <jasonr@gnu.org>
-
-        * w32-fns.el: Sync charset names with setup-default-fontset.
-        Append "-1" where second part missing.
-
 2007-11-11  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * faces.el (face-normalize-spec): Remove function.
         (frame-set-background-mode): Undo last change.
 
+2007-11-10  Jason Rumney  <jasonr@gnu.org>
+
+        * w32-fns.el: Sync charset names with setup-default-fontset.
+        Append "-1" where second part missing.
+
 2007-11-10  Juri Linkov  <juri@jurta.org>
 
         * isearch.el (isearch-mode-end-hook, isearch-mode-end-hook-quit):
diff --git a/lisp/ChangeLog.unicode b/lisp/ChangeLog.unicode
index 6cc1677634b..aff9dd57c8f 100644
--- a/lisp/ChangeLog.unicode
+++ b/lisp/ChangeLog.unicode
@@ -1,3 +1,11 @@
+2007-11-11  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+        * ps-print.el (ps-do-despool): Do not force ps-lpr-switches to be a
+        list.
+        (ps-begin-job): Error if ps-lpr-switches is not a list.
+        (ps-face-background-name): Remove this function.  It's already defined
+        in ps-def.el file.
+
 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
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index f66416de667..c327c25bf6c 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -1480,10 +1480,6 @@ Please send all bug fixes and enhancements to
 ;; Load XEmacs/Emacs definitions
 (eval-and-compile (require 'ps-def))
 
-(defun ps-face-background-name (face)
-  (if (featurep 'xemacs)
-      (ps-xemacs-color-name (face-background face))
-    (face-background face nil t)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; User Variables:
@@ -5831,6 +5827,8 @@ XSTART YSTART are the relative position for the first page in a sheet.")
   ;; initialize page dimensions
   (ps-get-page-dimensions)
   ;; final check
+  (unless (listp ps-lpr-switches)
+    (error "`ps-lpr-switches' value should be a list."))
   (and ps-color-p
        (equal ps-default-background ps-default-foreground)
        (error
@@ -6514,9 +6512,7 @@ If FACE is not a valid face name, use default face."
                                     (and (boundp 'printer-name)
                                          (symbol-value 'printer-name))))
                (ps-lpr-switches
-                (append (if (listp ps-lpr-switches)
-                            ps-lpr-switches
-                          (list ps-lpr-switches))
+                (append ps-lpr-switches
                         (and (stringp ps-printer-name)
                              (string< "" ps-printer-name)
                              (list (concat