# HG changeset patch
# User Vinicius Jose Latorre <viniciusjl@ig.com.br>
# Date 1194790470 0
# Node ID 5843af4ba940b377fb4d2704f63d44918172590a
# Parent  880960b7047440153a0b40517a8fdd3be66ee026
Error if ps-lpr-switches is not a list.

diff -r 880960b70474 -r 5843af4ba940 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Nov 11 00:56:44 2007 +0000
+++ b/lisp/ChangeLog	Sun Nov 11 14:14:30 2007 +0000
@@ -1,13 +1,13 @@
+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-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  Juri Linkov  <juri@jurta.org>
 
 	* isearch.el (isearch-mode-end-hook, isearch-mode-end-hook-quit):
diff -r 880960b70474 -r 5843af4ba940 lisp/ChangeLog.unicode
--- a/lisp/ChangeLog.unicode	Sun Nov 11 00:56:44 2007 +0000
+++ b/lisp/ChangeLog.unicode	Sun Nov 11 14:14:30 2007 +0000
@@ -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 -r 880960b70474 -r 5843af4ba940 lisp/ps-print.el
--- a/lisp/ps-print.el	Sun Nov 11 00:56:44 2007 +0000
+++ b/lisp/ps-print.el	Sun Nov 11 14:14:30 2007 +0000
@@ -1480,10 +1480,6 @@
 ;; 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 @@
   ;; 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 @@
 				    (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