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

3 files changed, 172 insertions, 216 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9dd9c9d4c4b..fef3bfe5b7c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,39 +1,3 @@
-2007-10-31  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
-
-        * ps-print.el: Eliminate the check if ps-print was running on Lucid or
-        Epoch emacsen.
-
-2007-10-27  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
-
-        * ps-print.el: Now detect if text foreground and background colors are
-        equals and replace the foreground color by another color, so the text
-        becomes visible.  Doc fix.
-        (ps-print-version): New version 7.3.
-        (ps-default-fg, ps-default-bg): Docstring fix.
-        (ps-fg-list, ps-fg-validate-p): New options.
-        (ps-foreground-list): New var.
-        (ps-generate-header-line): Replace fboundp by functionp.
-        (ps-setup, ps-begin-job, ps-plot-region): Fix code.
-
-2007-10-26  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
-
-        * printing.el: Pacify byte compiler, that is, no compiler warnings.
-        Move (again) some variable definitions before use, define some fun
-        aliases, no code change.
-        (pr-version): New version 6.9.2.
-        (pr-path-style, pr-auto-region, pr-menu-char-height)
-        (pr-menu-char-width, pr-menu-lock, pr-ps-printer-alist)
-        (pr-txt-printer-alist, pr-ps-utility-alist): Options declaration
-        via (defvar VAR).
-        (pr-menu-lookup, pr-menu-lock, pr-menu-alist, pr-even-or-odd-pages)
-        (pr-menu-get-item, pr-menu-set-item-name, pr-menu-set-utility-title)
-        (pr-menu-set-ps-title, pr-menu-set-txt-title, pr-region-active-p)
-        (pr-do-update-menus, pr-update-mode-line, pr-f-read-string)
-        (pr-f-set-keymap-parents, pr-keep-region-active): Fun aliases.
-        (pr-menu-print-item, pr-ps-printer-menu-modified)
-        (pr-txt-printer-menu-modified, pr-ps-utility-menu-modified)
-        (pr-even-or-odd-alist): Vars definition moved.
-
 2007-10-26  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * emulation/pc-select.el (next-line-mark, next-line-nomark)
@@ -1382,16 +1346,6 @@
 
         * international/characters.el: Undo unwanted and unexplained change.
 
-2007-10-10  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
-
-        * ps-print.el: Fix the usage of :foreground and :background face
-        attributes.  Reported by Nikolaj Schumacher <n_schumacher@web.de>.
-        (ps-print-version): New version 6.7.6.
-        (ps-face-attributes, ps-face-attribute-list, ps-face-background):
-        Fix code.
-        (ps-face-foreground-color-p, ps-face-background-color-p)
-        (ps-face-color-p): New inline funs.
-
 2007-10-10  Carsten Dominik  <dominik@science.uva.nl>
 
         * textmodes/org.el (org-additional-option-like-keywords): New constant.
@@ -3799,19 +3753,6 @@
         (suspend-tty-functions, resume-tty-functions): Install extra hooks
         for multi-tty.
 
-2007-10-10  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
-
-        * ps-print.el: Fix the usage of :foreground and :background face
-        attributes.  Reported by Nikolaj Schumacher <n_schumacher@web.de>.
-        (ps-print-version): New version 7.2.5.
-        (ps-face-attributes, ps-face-attribute-list, ps-face-background): Fix
-        code.
-        (ps-face-foreground-color-p, ps-face-background-color-p)
-        (ps-face-color-p): New inline funs.
-        (ps-background, ps-begin-file, ps-build-reference-face-lists): Use
-        `mapc' rather than `mapcar'.
-
-
 2007-08-29  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * simple.el (invisible-p): Remove: implemented in C now.
@@ -4471,16 +4412,6 @@
 
         * calc/calc.el (calc-language-alist): Add texinfo-mode.
 
-2007-08-16  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
-
-        * ps-print.el (ps-header-font-size, ps-header-title-font-size)
-        (ps-footer-font-size, ps-line-number-font-size, ps-line-spacing)
-        (ps-paragraph-spacing): Docstring fix.
-
-2007-08-16  Glenn Morris  <rgm@gnu.org>
-
-        * ps-print.el (ps-font-size): Doc fix.
-
 2007-08-16  Richard Stallman  <rms@gnu.org>
 
         * emacs-lisp/copyright.el (copyright-names-regexp): Add custom group.
@@ -4791,13 +4722,6 @@
         (tex-font-script-display, tex-font-lock-suscript): Change from a cons
         cell to a list of 2 elements to simplify the unfontify code.
 
-2007-08-08  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
-
-        * ps-print.el (ps-default-fg, ps-default-bg): Docstring fix.
-        (ps-begin-job): Use ps-default-fg and ps-default-bg only when
-        ps-print-color-p is neither nil nor black-white.  Reported by Christian
-        Schlauer <cs-muelleimer-rubbish.bin@arcor.de>.
-
 2007-08-08  Andreas Schwab  <schwab@suse.de>
 
         * mail/mailabbrev.el (sendmail-pre-abbrev-expand-hook): Check for
@@ -4879,10 +4803,6 @@
         format-mode-line because it may be a list,
         e.g., (sgml-xml-mode "XML" "SGML"), and not a string.
 
-2007-08-06  Vinicius Jose Latorre  <viniciusig@ig.com.br>
-
-        * printing.el (pr-update-menus): Docstring fix.
-
 2007-08-06  Jason Rumney  <jasonr@gnu.org>
 
         * menu-bar.el (menu-bar-vc-filter): Use vc-call-backend.
@@ -4926,11 +4846,6 @@
         * calc/calc-nlfit.el (math-nlfit-curve): Remove unnecessary variables.
         (math-nlfit-givens): Let bind free variables.
 
-2007-08-05  Vinicius Jose Latorre  <viniciusig@ig.com.br>
-
-        * printing.el: Require lpr and ps-print when loading printing package.
-        Reported by Glenn Morris <rgm@gnu.org>.
-
 2007-08-05  Michael Albinus  <michael.albinus@gmx.de>
 
         * files.el (set-auto-mode): Handle also remote files wrt
@@ -4960,13 +4875,6 @@
         may match up to 4 lines.
         (diff-beginning-of-file-and-junk): Rewrite.
 
-2007-08-03  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
-
-        * printing.el: Evaluate require only during compilation.
-        (pr-version): New version 6.9.1.
-        (deactivate-mark): Replace (defvar VAR nil) by (defvar VAR).
-        (pr-global-menubar): Fix code.
-
 2007-08-03  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * term.el (term-erase-in-display): Fix case when point is not at
@@ -5257,59 +5165,6 @@
         * vc-git.el (vc-git-revision-table)
         (vc-git-revision-completion-table): New functions.
 
-2007-07-26  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
-
-        * progmodes/ebnf-abn.el (ebnf-abn-skip-comment):
-        * progmodes/ebnf-bnf.el (ebnf-bnf-skip-comment):
-        * progmodes/ebnf-dtd.el (ebnf-dtd-skip-comment):
-        * progmodes/ebnf-ebx.el (ebnf-ebx-skip-comment):
-        * progmodes/ebnf-iso.el (ebnf-iso-skip-comment):
-        * progmodes/ebnf-yac.el (ebnf-yac-skip-comment): New version.
-        New command actions for EPS header and EPS footer.
-
-        * progmodes/ebnf2ps.el: New command actions for EPS header and EPS
-        footer.  Fix some problems with one-or-more, zero-or-more and
-        alternative constructions generation.  Some log messages
-        implementation.  Doc fix.
-        (ebnf-version): New version 4.4.
-        (ebnf-eps-header-font, ebnf-eps-header, ebnf-eps-footer-font)
-        (ebnf-eps-footer, ebnf-log): New options.
-        (ebnf-find-style, ebnf-eps-header-footer, ebnf-eps-header)
-        (ebnf-eps-footer, ebnf-eps-string, ebnf-eps-header-footer-comment)
-        (ebnf-eps-header-footer-p, ebnf-eps-header-comment)
-        (ebnf-eps-footer-comment, ebnf-eps-header-footer-file)
-        (ebnf-eps-header-footer-set, ebnf-log-header, ebnf-log): New funs.
-        (ebnf-style-custom-list, ebnf-style-database): Put new values.
-        (ebnf-print-directory, ebnf-print-file, ebnf-print-buffer)
-        (ebnf-print-region, ebnf-spool-directory, ebnf-spool-file)
-        (ebnf-spool-buffer, ebnf-spool-region, ebnf-eps-directory)
-        (ebnf-eps-file, ebnf-eps-buffer, ebnf-eps-region)
-        (ebnf-syntax-directory, ebnf-syntax-file, ebnf-syntax-buffer)
-        (ebnf-syntax-region, ebnf-parse-and-sort, ebnf-begin-job)
-        (ebnf-dimensions, ebnf-production-dimension, ebnf-terminal-dimension)
-        (ebnf-non-terminal-dimension, ebnf-special-dimension)
-        (ebnf-terminal-dimension1, ebnf-repeat-dimension)
-        (ebnf-except-dimension, ebnf-alternative-dimension)
-        (ebnf-optional-dimension, ebnf-one-or-more-dimension)
-        (ebnf-zero-or-more-dimension, ebnf-sequence-dimension): Insert log
-        message fun.
-        (ebnf-setup, ebnf-generate-one-or-more, ebnf-generate-zero-or-more)
-        (ebnf-begin-job, ebnf-begin-file, ebnf-eps-finish-and-write)
-        (ebnf-insert-ebnf-prologue, ebnf-production-dimension)
-        (ebnf-terminal-dimension1, ebnf-alternative-dimension)
-        (ebnf-one-or-more-dimension, ebnf-zero-or-more-dimension)
-        (ebnf-eps-add-context, ebnf-eps-add-production): Fix code.
-        (ebnf-eps-filename, ebnf-trim-right): Replace `?\s' by `?\ ' to keep
-        compatibility with Emacs 20 & 21.
-        (ebnf-eps-header-comment, ebnf-eps-footer-comment)
-        (ebnf-eps-file-alist, ebnf-basic-width-extra)
-        (ebnf-basic-empty-height): New vars.
-        (ebnf-prologue): Fix PostScript code.
-        (ebnf-make-empty, ebnf-make-terminal1, ebnf-make-or-more1)
-        (ebnf-make-production, ebnf-make-alternative, ebnf-make-optional)
-        (ebnf-make-except, ebnf-make-repeat, ebnf-make-sequence)
-        (ebnf-make-dup-sequence, ebnf-token-alternative): Add comments.
-
 2007-07-25  Glenn Morris  <rgm@gnu.org>
 
         * Relicense all FSF files to GPLv3 or later.
@@ -5322,18 +5177,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.
@@ -5388,14 +5231,6 @@
         * vc-git.el (vc-git-log-view-mode): Port to the multi-file vc interface.
         (vc-git-create-snapshot, vc-git-retrieve-snapshot): New functions.
 
-2007-07-25  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
-
-        * ps-print.el (ps-multibyte-buffer): Docstring fix.
-
-        * ps-mule.el: Doc fix.
-        (ps-multibyte-buffer, ps-mule-font-info-database-default)
-        (ps-mule-external-libraries, ps-mule-begin-job): Docstring fix.
-
 2007-07-25  Glenn Morris  <rgm@gnu.org>
 
         * calendar/cal-tex.el (cal-tex-which-days, cal-tex-holidays)
@@ -5779,18 +5614,6 @@
 
         * vc-hg.el (vc-hg-diff): Use vc-hg-command.
 
-2007-07-20  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-20  Eli Zaretskii  <eliz@gnu.org>
 
         * makefile.w32-in (install-lisp-SH): Don't create subdirectories
@@ -8035,32 +7858,6 @@
         for start and end positions.
         (ispell-word): Assume END is a marker.
 
-2007-05-17  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
-
-        * printing.el: Group together all XEmacs/Emacs definitions.
-        (pr-version): New version 6.9.
-        (pr-global-menubar, pr-menu-char-height, pr-menu-char-width): New funs.
-        (pr-menu-char-height, pr-menu-char-width): Fix initialization code.
-        (pr-menu-bind): Fix code.
-        (pr-e-frame-char-height, pr-e-frame-char-width)
-        (pr-e-mouse-pixel-position, pr-x-add-submenu, pr-x-event-function)
-        (pr-x-event-object, pr-x-find-menu-item, pr-x-font-height)
-        (pr-x-font-width, pr-x-get-popup-menu-response, pr-x-make-event)
-        (pr-x-misc-user-event-p, pr-x-relabel-menu-item, pr-x-event-x-pixel)
-        (pr-x-event-y-pixel): Aliases eliminated.
-        (pr-xemacs-global-menubar): Macro moved.
-        (current-menubar, current-mouse-event, zmacs-region-stays)
-        (deactivate-mark, pr-menu-position, pr-menu-state, pr-ps-name-old)
-        (pr-txt-name-old, pr-ps-utility-old, pr-even-or-odd-old, pr-temp-menu):
-        Vars moved.
-        (pr-region-active-p, pr-menu-position, pr-menu-lookup, pr-menu-lock)
-        (pr-update-mode-line, pr-do-update-menus, pr-menu-alist)
-        (pr-relabel-menu-item, pr-menu-set-ps-title, pr-menu-set-txt-title)
-        (pr-menu-set-utility-title, pr-even-or-odd-pages)
-        (pr-f-set-keymap-parents, pr-f-set-keymap-name, pr-f-read-string)
-        (pr-keep-region-active, pr-menu-get-item, pr-menu-set-item-name): Funs
-        moved.
-
 2007-05-17  Christian Plate  <cplate@web.de>  (tiny change)
 
         * textmodes/sgml-mode.el (sgml-tag):
@@ -8123,15 +7920,6 @@
         * files.el (mode-require-final-newline, require-final-newline)
         (enable-local-variables, enable-local-eval): Doc fixes.
 
-2007-05-13  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
-
-        * ps-print.el: Use default color when foreground or background color
-        are unspecified.  Reported by Leo <sdl.web@gmail.com>.
-        (ps-print-version): New version 6.7.4.
-        (ps-rgb-color): New argument.  Use default color when color is
-        unspecified.
-        (ps-begin-job): Fix code.
-
 2007-05-12  Chong Yidong  <cyd@stupidchicken.com>
 
         * longlines.el (longlines-mode): Make longlines-auto-wrap
diff --git a/lisp/ChangeLog.unicode b/lisp/ChangeLog.unicode
index 7ed0504e461..6cc1677634b 100644
--- a/lisp/ChangeLog.unicode
+++ b/lisp/ChangeLog.unicode
@@ -1,3 +1,45 @@
+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 7.3.1.
+
+2007-10-31  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+        * ps-print.el: Eliminate the check if ps-print was running on Lucid or
+        Epoch emacsen.
+
+2007-10-27  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+        * ps-print.el: Now detect if text foreground and background colors are
+        equals and replace the foreground color by another color, so the text
+        becomes visible.  Doc fix.
+        (ps-print-version): New version 7.3.
+        (ps-default-fg, ps-default-bg): Docstring fix.
+        (ps-fg-list, ps-fg-validate-p): New options.
+        (ps-foreground-list): New var.
+        (ps-generate-header-line): Replace fboundp by functionp.
+        (ps-setup, ps-begin-job, ps-plot-region): Fix code.
+
+2007-10-26  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+        * printing.el: Pacify byte compiler, that is, no compiler warnings.
+        Move (again) some variable definitions before use, define some fun
+        aliases, no code change.
+        (pr-version): New version 6.9.2.
+        (pr-path-style, pr-auto-region, pr-menu-char-height)
+        (pr-menu-char-width, pr-menu-lock, pr-ps-printer-alist)
+        (pr-txt-printer-alist, pr-ps-utility-alist): Options declaration
+        via (defvar VAR).
+        (pr-menu-lookup, pr-menu-lock, pr-menu-alist, pr-even-or-odd-pages)
+        (pr-menu-get-item, pr-menu-set-item-name, pr-menu-set-utility-title)
+        (pr-menu-set-ps-title, pr-menu-set-txt-title, pr-region-active-p)
+        (pr-do-update-menus, pr-update-mode-line, pr-f-read-string)
+        (pr-f-set-keymap-parents, pr-keep-region-active): Fun aliases.
+        (pr-menu-print-item, pr-ps-printer-menu-modified)
+        (pr-txt-printer-menu-modified, pr-ps-utility-menu-modified)
+        (pr-even-or-odd-alist): Vars definition moved.
+
 2007-10-23  Kenichi Handa  <handa@m17n.org>
 
         * language/chinese.el (cp936): Delete duplicated alias.
@@ -38,6 +80,18 @@
         * international/encoded-kb.el (encoded-kbd-setup-display): Use the new
         multi-tty code, which includes the previous local change.
 
+2007-10-10  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+        * ps-print.el: Fix the usage of :foreground and :background face
+        attributes.  Reported by Nikolaj Schumacher <n_schumacher@web.de>.
+        (ps-print-version): New version 7.2.5.
+        (ps-face-attributes, ps-face-attribute-list, ps-face-background): Fix
+        code.
+        (ps-face-foreground-color-p, ps-face-background-color-p)
+        (ps-face-color-p): New inline funs.
+        (ps-background, ps-begin-file, ps-build-reference-face-lists): Use
+        `mapc' rather than `mapcar'.
+
 2007-09-07  Kenichi Handa  <handa@m17n.org>
 
         * skeleton.el (skeleton-internal-1): Use integerp and stringp
@@ -54,6 +108,92 @@
         * play/gamegrid.el (gamegrid-setup-default-font): Calculate a font
         height that doesn't exceed the requested height by rounding off.
 
+2007-08-16  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+        * ps-print.el (ps-header-font-size, ps-header-title-font-size)
+        (ps-footer-font-size, ps-line-number-font-size, ps-line-spacing)
+        (ps-paragraph-spacing): Docstring fix.
+
+2007-08-16  Glenn Morris  <rgm@gnu.org>
+
+        * ps-print.el (ps-font-size): Doc fix.
+
+2007-08-08  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+        * ps-print.el (ps-default-fg, ps-default-bg): Docstring fix.
+        (ps-begin-job): Use ps-default-fg and ps-default-bg only when
+        ps-print-color-p is neither nil nor black-white.  Reported by Christian
+        Schlauer <cs-muelleimer-rubbish.bin@arcor.de>.
+
+2007-08-06  Vinicius Jose Latorre  <viniciusig@ig.com.br>
+
+        * printing.el (pr-update-menus): Docstring fix.
+
+2007-08-05  Vinicius Jose Latorre  <viniciusig@ig.com.br>
+
+        * printing.el: Require lpr and ps-print when loading printing package.
+        Reported by Glenn Morris <rgm@gnu.org>.
+
+2007-08-03  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+        * printing.el: Evaluate require only during compilation.
+        (pr-version): New version 6.9.1.
+        (deactivate-mark): Replace (defvar VAR nil) by (defvar VAR).
+        (pr-global-menubar): Fix code.
+
+2007-07-26  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+        * progmodes/ebnf-abn.el (ebnf-abn-skip-comment):
+        * progmodes/ebnf-bnf.el (ebnf-bnf-skip-comment):
+        * progmodes/ebnf-dtd.el (ebnf-dtd-skip-comment):
+        * progmodes/ebnf-ebx.el (ebnf-ebx-skip-comment):
+        * progmodes/ebnf-iso.el (ebnf-iso-skip-comment):
+        * progmodes/ebnf-yac.el (ebnf-yac-skip-comment): New version.
+        New command actions for EPS header and EPS footer.
+
+        * progmodes/ebnf2ps.el: New command actions for EPS header and EPS
+        footer.  Fix some problems with one-or-more, zero-or-more and
+        alternative constructions generation.  Some log messages
+        implementation.  Doc fix.
+        (ebnf-version): New version 4.4.
+        (ebnf-eps-header-font, ebnf-eps-header, ebnf-eps-footer-font)
+        (ebnf-eps-footer, ebnf-log): New options.
+        (ebnf-find-style, ebnf-eps-header-footer, ebnf-eps-header)
+        (ebnf-eps-footer, ebnf-eps-string, ebnf-eps-header-footer-comment)
+        (ebnf-eps-header-footer-p, ebnf-eps-header-comment)
+        (ebnf-eps-footer-comment, ebnf-eps-header-footer-file)
+        (ebnf-eps-header-footer-set, ebnf-log-header, ebnf-log): New funs.
+        (ebnf-style-custom-list, ebnf-style-database): Put new values.
+        (ebnf-print-directory, ebnf-print-file, ebnf-print-buffer)
+        (ebnf-print-region, ebnf-spool-directory, ebnf-spool-file)
+        (ebnf-spool-buffer, ebnf-spool-region, ebnf-eps-directory)
+        (ebnf-eps-file, ebnf-eps-buffer, ebnf-eps-region)
+        (ebnf-syntax-directory, ebnf-syntax-file, ebnf-syntax-buffer)
+        (ebnf-syntax-region, ebnf-parse-and-sort, ebnf-begin-job)
+        (ebnf-dimensions, ebnf-production-dimension, ebnf-terminal-dimension)
+        (ebnf-non-terminal-dimension, ebnf-special-dimension)
+        (ebnf-terminal-dimension1, ebnf-repeat-dimension)
+        (ebnf-except-dimension, ebnf-alternative-dimension)
+        (ebnf-optional-dimension, ebnf-one-or-more-dimension)
+        (ebnf-zero-or-more-dimension, ebnf-sequence-dimension): Insert log
+        message fun.
+        (ebnf-setup, ebnf-generate-one-or-more, ebnf-generate-zero-or-more)
+        (ebnf-begin-job, ebnf-begin-file, ebnf-eps-finish-and-write)
+        (ebnf-insert-ebnf-prologue, ebnf-production-dimension)
+        (ebnf-terminal-dimension1, ebnf-alternative-dimension)
+        (ebnf-one-or-more-dimension, ebnf-zero-or-more-dimension)
+        (ebnf-eps-add-context, ebnf-eps-add-production): Fix code.
+        (ebnf-eps-filename, ebnf-trim-right): Replace `?\s' by `?\ ' to keep
+        compatibility with Emacs 20 & 21.
+        (ebnf-eps-header-comment, ebnf-eps-footer-comment)
+        (ebnf-eps-file-alist, ebnf-basic-width-extra)
+        (ebnf-basic-empty-height): New vars.
+        (ebnf-prologue): Fix PostScript code.
+        (ebnf-make-empty, ebnf-make-terminal1, ebnf-make-or-more1)
+        (ebnf-make-production, ebnf-make-alternative, ebnf-make-optional)
+        (ebnf-make-except, ebnf-make-repeat, ebnf-make-sequence)
+        (ebnf-make-dup-sequence, ebnf-token-alternative): Add comments.
+
 2007-07-26  Andreas Schwab  <schwab@suse.de>
 
         * international/mule-diag.el (print-fontset-element): Use fontp
@@ -142,6 +282,32 @@
         (glyph-char): Likewise.
         (glyph-face): Likewise.
 
+2007-05-17  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+        * printing.el: Group together all XEmacs/Emacs definitions.
+        (pr-version): New version 6.9.
+        (pr-global-menubar, pr-menu-char-height, pr-menu-char-width): New funs.
+        (pr-menu-char-height, pr-menu-char-width): Fix initialization code.
+        (pr-menu-bind): Fix code.
+        (pr-e-frame-char-height, pr-e-frame-char-width)
+        (pr-e-mouse-pixel-position, pr-x-add-submenu, pr-x-event-function)
+        (pr-x-event-object, pr-x-find-menu-item, pr-x-font-height)
+        (pr-x-font-width, pr-x-get-popup-menu-response, pr-x-make-event)
+        (pr-x-misc-user-event-p, pr-x-relabel-menu-item, pr-x-event-x-pixel)
+        (pr-x-event-y-pixel): Aliases eliminated.
+        (pr-xemacs-global-menubar): Macro moved.
+        (current-menubar, current-mouse-event, zmacs-region-stays)
+        (deactivate-mark, pr-menu-position, pr-menu-state, pr-ps-name-old)
+        (pr-txt-name-old, pr-ps-utility-old, pr-even-or-odd-old, pr-temp-menu):
+        Vars moved.
+        (pr-region-active-p, pr-menu-position, pr-menu-lookup, pr-menu-lock)
+        (pr-update-mode-line, pr-do-update-menus, pr-menu-alist)
+        (pr-relabel-menu-item, pr-menu-set-ps-title, pr-menu-set-txt-title)
+        (pr-menu-set-utility-title, pr-even-or-odd-pages)
+        (pr-f-set-keymap-parents, pr-f-set-keymap-name, pr-f-read-string)
+        (pr-keep-region-active, pr-menu-get-item, pr-menu-set-item-name): Funs
+        moved.
+
 2007-05-16  Juanma Barranquero  <lekktu@gmail.com>
 
         * printing.el (pr-ps-fast-fire): Fix typos in docstring.
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index d879d1795d7..7c408573797 100644
--- 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: 7.3
+;; Version: 7.3.1
 ;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
 
-(defconst ps-print-version "7.3"
-  "ps-print.el, v 7.3 <2007/10/26 vinicius>
+(defconst ps-print-version "7.3.1"
+  "ps-print.el, v 7.3.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
@@ -6510,7 +6510,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