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

[Miles Bader]

Index: emacs/lisp/ps-mule.el
diff -c emacs/lisp/ps-mule.el:1.30.2.4 emacs/lisp/ps-mule.el:1.30.2.5
*** emacs/lisp/ps-mule.el:1.30.2.4      Sat Sep  4 09:26:22 2004
--- emacs/lisp/ps-mule.el       Thu Sep 16 00:12:21 2004
***************
*** 418,438 ****
  
  (defun ps-mule-encode-bit (string delta)
    (let* ((dim (charset-dimension (char-charset (string-to-char string))))
!        (len (* (ps-mule-chars-in-string string) dim))
         (str (make-string len 0))
         (i 0)
         (j 0))
      (if (= dim 1)
        (while (< j len)
          (aset str j
!               (+ (nth 1 (split-char (ps-mule-string-char string i))) delta))
!         (setq i (ps-mule-next-index string i)
                j (1+ j)))
        (while (< j len)
!       (let ((split (split-char (ps-mule-string-char string i))))
          (aset str j (+ (nth 1 split) delta))
          (aset str (1+ j) (+ (nth 2 split) delta))
!         (setq i (ps-mule-next-index string i)
                j (+ j 2)))))
      str))
  
--- 418,438 ----
  
  (defun ps-mule-encode-bit (string delta)
    (let* ((dim (charset-dimension (char-charset (string-to-char string))))
!        (len (* (length string) dim))
         (str (make-string len 0))
         (i 0)
         (j 0))
      (if (= dim 1)
        (while (< j len)
          (aset str j
!               (+ (nth 1 (split-char (aref string i))) delta))
!         (setq i (1+ i)
                j (1+ j)))
        (while (< j len)
!       (let ((split (split-char (aref string i))))
          (aset str j (+ (nth 1 split) delta))
          (aset str (1+ j) (+ (nth 2 split) delta))
!         (setq i (1+ i)
                j (+ j 2)))))
      str))
  
***************
*** 468,480 ****
  
  ;; Special encoding for mule-unicode-* characters.
  (defun ps-mule-encode-ucs2 (string)
!   (let* ((len (ps-mule-chars-in-string string))
         (str (make-string (* 2 len) 0))
         (i 0)
         (j 0)
         ch hi lo)
      (while (< i len)
!       (setq ch (encode-char (ps-mule-string-char string i) 'ucs)
            hi (lsh ch -8)
            lo (logand ch 255))
        (aset str j hi)
--- 468,480 ----
  
  ;; Special encoding for mule-unicode-* characters.
  (defun ps-mule-encode-ucs2 (string)
!   (let* ((len (length string))
         (str (make-string (* 2 len) 0))
         (i 0)
         (j 0)
         ch hi lo)
      (while (< i len)
!       (setq ch (encode-char (aref string i) 'ucs)
            hi (lsh ch -8)
            lo (logand ch 255))
        (aset str j hi)
***************
*** 796,802 ****
            (cons from ps-width-remaining)
          (cons (if composition
                    (nth 1 composition)
!                 (ps-mule-next-point from))
                run-width)))
      ;; We assume that all characters in this range have the same width.
      (setq char-width (* char-width (charset-width ps-mule-current-charset)))
--- 796,802 ----
            (cons from ps-width-remaining)
          (cons (if composition
                    (nth 1 composition)
!                 (1+ from))
                run-width)))
      ;; We assume that all characters in this range have the same width.
      (setq char-width (* char-width (charset-width ps-mule-current-charset)))
***************
*** 849,855 ****
  
       ;; This case is obsolete for Emacs 21.
       ((eq ps-mule-current-charset 'composition)
!       (ps-mule-plot-composition from (ps-mule-next-point from) bg-color))
  
       (t
        ;; No way to print this charset.  Just show a vacant box of an
--- 849,855 ----
  
       ;; This case is obsolete for Emacs 21.
       ((eq ps-mule-current-charset 'composition)
!       (ps-mule-plot-composition from (1+ from) bg-color))
  
       (t
        ;; No way to print this charset.  Just show a vacant box of an