Doc fix.

(ps-mule-encode-header-string): If STRING is not a string, replace
STRING by empty string.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 76408f2a5264bed1573f868b678f46fe6d10d385..2755d066b327d5ae92af1d6d01c764c8e36a56df 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2001-08-14  Vinicius Jose Latorre  <vinicius@cpqd.com.br>
+
+       * ps-print.el: Change error function arguments to follow Emacs
+       message convention.  Doc fix.
+       (ps-print-version): New version number (6.5.4).
+       (coding-system-for-write): Change declaration position to avoid
+       XEmacs compilation gripes.
+       (coding-system-for-read, buffer-file-coding-system): Declarations
+       to avoid XEmacs compilation gripes.
+
+       * ps-mule.el: Doc fix.
+       (ps-mule-encode-header-string): If STRING is not a string, replace
+       STRING by empty string.
+
 2001-08-14  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * frame.el (show-trailing-whitespace): Doc fix.

diff --git a/lisp/ps-mule.el b/lisp/ps-mule.el
index e0c48db79f59c572d9cb1358d5a2c757e276dde8..91997c9610cd11eae5f34cb72347fabd9daa6e2f 100644 (file)
--- a/lisp/ps-mule.el
+++ b/lisp/ps-mule.el
@@ -3,11 +3,11 @@
 ;; Copyright (C) 1998,99,00,2001 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <vinicius@cpqd.com.br>
-;;     Kenichi Handa <handa@etl.go.jp> (multi-byte characters)
-;; Maintainer: Kenichi Handa <handa@etl.go.jp> (multi-byte characters)
-;;     Vinicius Jose Latorre <vinicius@cpqd.com.br>
+;;     Kenichi Handa <handa@etl.go.jp> (multi-byte characters)
+;; Maintainer: Kenichi Handa <handa@etl.go.jp> (multi-byte characters)
+;;     Vinicius Jose Latorre <vinicius@cpqd.com.br>
 ;; Keywords: wp, print, PostScript, multibyte, mule
-;; Time-stamp: <2001/03/16 18:50:59 Handa>
+;; Time-stamp: <2001/08/07 13:50:53 vinicius>
 
 ;; This file is part of GNU Emacs.
 
@@ -1362,9 +1362,12 @@ NewBitmapDict
 (defun ps-mule-encode-header-string (string fonttag)
   "Generate PostScript code for ploting STRING by font FONTTAG.
 FONTTAG should be a string \"/h0\" or \"/h1\"."
-  (setq string (if (multibyte-string-p string)
-                  (copy-sequence string)
-                (string-make-multibyte string)))
+  (setq string (cond ((not (stringp string))
+                     "")
+                    ((multibyte-string-p string)
+                     (copy-sequence string))
+                    (t
+                     (string-make-multibyte string))))
   (when ps-mule-header-charsets
     (if (eq (car ps-mule-header-charsets) 'latin-iso8859-1)
        ;; Latin1 characters can be printed by the standard PostScript