Mercurial > emacs
changeset 86033:4a4d5773bb72
Error if ps-lpr-switches is not a list.
| author | Vinicius Jose Latorre <viniciusjl@ig.com.br> |
|---|---|
| date | Sun, 11 Nov 2007 14:18:17 +0000 |
| parents | 27514b5a44bc |
| children | 430cc8630a39 |
| files | lisp/ChangeLog lisp/ps-print.el |
| diffstat | 2 files changed, 13 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sun Nov 11 03:20:35 2007 +0000 +++ b/lisp/ChangeLog Sun Nov 11 14:18:17 2007 +0000 @@ -1,13 +1,19 @@ -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 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. 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):
--- a/lisp/ps-print.el Sun Nov 11 03:20:35 2007 +0000 +++ b/lisp/ps-print.el Sun Nov 11 14:18:17 2007 +0000 @@ -6002,6 +6002,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 @@ -6843,9 +6845,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