[Emacs-diffs] Changes to emacs/lisp/ps-mule.el

[Kenichi Handa]

Index: emacs/lisp/ps-mule.el
diff -c emacs/lisp/ps-mule.el:1.37 emacs/lisp/ps-mule.el:1.38
*** emacs/lisp/ps-mule.el:1.37  Tue Feb 22 06:20:41 2005
--- emacs/lisp/ps-mule.el       Tue Mar 29 05:07:16 2005
***************
*** 824,830 ****
  
  Where ENDPOS is the end position of the sequence and RUN-WIDTH is the width of
  the sequence."
!   (setq ps-mule-current-charset (charset-after from))
    (let* ((wrappoint (ps-mule-find-wrappoint
                     from to (ps-avg-char-width 'ps-font-for-text)))
         (to (car wrappoint))
--- 824,832 ----
  
  Where ENDPOS is the end position of the sequence and RUN-WIDTH is the width of
  the sequence."
!   (let ((ch (char-after from)))
!     (setq ps-mule-current-charset
!         (char-charset (or (aref ps-print-translation-table ch) ch))))
    (let* ((wrappoint (ps-mule-find-wrappoint
                     from to (ps-avg-char-width 'ps-font-for-text)))
         (to (car wrappoint))
***************
*** 832,837 ****
--- 834,843 ----
                              (ps-font-alist 'ps-font-for-text))))
         (font-spec (ps-mule-get-font-spec ps-mule-current-charset font-type))
         (string (buffer-substring-no-properties from to)))
+     (dotimes (i (length string))
+       (let ((ch (aref ps-print-translation-table (aref string i))))
+       (if ch
+           (aset string i ch))))
      (cond
       ((= from to)
        ;; We can't print any more characters in the current line.
***************
*** 1469,1481 ****
         (setq ps-mule-charset-list
               (delq 'ascii (delq 'eight-bit-control
                                  (delq 'eight-bit-graphic 
!                                       (find-charset-region from to))))
               ps-mule-header-charsets
               (delq 'ascii (delq 'eight-bit-control
                                  (delq 'eight-bit-graphic 
                                        (find-charset-string
                                         (mapconcat
!                                         'identity header-footer-list ""))))))
         (dolist (cs ps-mule-charset-list)
           (or (ps-mule-printable-p cs)
               (push cs unprintable-charsets)))
--- 1475,1489 ----
         (setq ps-mule-charset-list
               (delq 'ascii (delq 'eight-bit-control
                                  (delq 'eight-bit-graphic 
!                                       (find-charset-region
!                                        from to ps-print-translation-table))))
               ps-mule-header-charsets
               (delq 'ascii (delq 'eight-bit-control
                                  (delq 'eight-bit-graphic 
                                        (find-charset-string
                                         (mapconcat
!                                         'identity header-footer-list "")
!                                        ps-print-translation-table)))))
         (dolist (cs ps-mule-charset-list)
           (or (ps-mule-printable-p cs)
               (push cs unprintable-charsets)))