Mercurial > emacs
changeset 91086:5843af4ba940
Error if ps-lpr-switches is not a list.
| author | Vinicius Jose Latorre <viniciusjl@ig.com.br> |
|---|---|
| date | Sun, 11 Nov 2007 14:14:30 +0000 |
| parents | 880960b70474 |
| children | 66f982c3b25e |
| files | lisp/ChangeLog lisp/ChangeLog.unicode lisp/ps-print.el |
| diffstat | 3 files changed, 16 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- 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):
--- 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
--- 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