(ccl-decode-mule-utf-8): Lookup

utf-subst-table-for-decode even for U+E000..U+FFFF.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 31a53c1b99c2f350374e6a8bfc53e57f8b5b8427..392a4a2646cd83f0c835d0dfc5da9849b8e7df52 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2003-10-02  Kenichi Handa  <handa@m17n.org>
+
+       * international/utf-8.el (ccl-decode-mule-utf-8): Lookup
+       utf-subst-table-for-decode even for U+E000..U+FFFF.
+
+       * international/subst-jis.el: Include U+FF00..U+FFEF in decode
+       table.
+       * international/subst-big5.el: Likewise.
+       * international/subst-gb2312.el: Likewise
+       * international/subst-ksc.el: Likewise.
+
 2003-10-01  Glenn Morris  <gmorris@ast.cam.ac.uk>
 
        * calendar/calendar.el (increment-calendar-month)

diff --git a/lisp/international/utf-8.el b/lisp/international/utf-8.el
index 85bdae7ac649c832ef2abb1b9be87a29aa4d0653..54f6633ce4206390c6baa8ae7fe11608a1a1c014 100644 (file)
--- a/lisp/international/utf-8.el
+++ b/lisp/international/utf-8.el
@@ -448,12 +448,19 @@ default.  Also, installing them may be rather slow."
 
                            ;; mule-unicode-e000-ffff
                            ;; Fixme: fffe and ffff are invalid.
-                           ((r0 = ,(charset-id 'mule-unicode-e000-ffff))
-                            (r3 -= #xe000)
-                            (r3 //= 96)
-                            (r1 = (r7 + 32))
-                            (r1 += ((r3 + 32) << 7))
-                            (write-multibyte-character r0 r1)))))))))
+                           ((r4 = r3)  ; don't zap r3
+                            (lookup-integer utf-subst-table-for-decode r4 r5)
+                            (if r7
+                                ;; got a translation
+                                ((write-multibyte-character r4 r5)
+                                 ;; Zapped through register starvation.
+                                 (r5 = ,(charset-id 'eight-bit-control)))
+                              ((r0 = ,(charset-id 'mule-unicode-e000-ffff))
+                               (r3 -= #xe000)
+                               (r3 //= 96)
+                               (r1 = (r7 + 32))
+                               (r1 += ((r3 + 32) << 7))
+                               (write-multibyte-character r0 r1)))))))))))
 
              (if (r0 < #xfe)
                  ;; 4byte encoding