*** empty log message ***

3 files changed, 86 insertions, 5 deletions

diff --git a/etc/NEWS b/etc/NEWS
index b232da4af02..4a341b137fb 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -717,11 +717,12 @@ and windows-1251 are preloaded since the former is so common and the
 latter is used by GNU locales.
 
 ** The utf-8/16 coding systems have been enhanced.
-By default, untranslatable utf-8 sequences (mostly representing CJK
-characters) are simply composed into single quasi-characters.  User
-option `utf-translate-cjk' arranges to translate many utf-8 CJK
-character sequences into real Emacs characters in a similar way to the
-Mule-UCS system.  This uses significant space, so is not the default.
+By default, untranslatable utf-8 sequences are simply composed into
+single quasi-characters.  User option `utf-translate-cjk-mode' (it is
+turned on by default) arranges to translate many utf-8 CJK character
+sequences into real Emacs characters in a similar way to the Mule-UCS
+system.  As this loads a fairly big data on demand, people who are not
+interested in CJK characters may want to customize it to nil.
 You can augment/amend the CJK translation via hash tables
 `ucs-mule-cjk-to-unicode' and `ucs-unicode-to-mule-cjk'.  The utf-8
 coding system now also encodes characters from most of Emacs's
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b448338fec1..2f99d3dfc6d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,68 @@
+2004-06-12  Kenichi Handa  <handa@m17n.org>
+
+        * international/mule-cmds.el (set-language-environment): Load
+        subst tables if necessary.
+
+        * international/mule.el (decode-char): Load subst tables if
+        necessary.
+        (encode-char): Likewise.
+
+        * international/utf-16.el (utf-16-decode-ucs): Handle a surrogate
+        pair correctly.  Call ccl-mule-utf-untrans for untranslable chars.
+        (utf-16le-decode-loop): Set r5 to -1 before loop.
+        (utf-16be-decode-loop): Likewise.
+        (ccl-decode-mule-utf-16le): Add EOF processing block.
+        (ccl-decode-mule-utf-16be): Likewise.
+        (ccl-decode-mule-utf-16le-with-signature): Likewise.
+        (ccl-decode-mule-utf-16be-with-signature): Likewise.
+        (ccl-decode-mule-utf-16): Likewise.  Set r5 to -1 initially.
+        (ccl-mule-utf-16-encode-untrans): New CCL.
+        (utf-16-decode-to-ucs): Handle pre-read character.
+        (utf-16le-encode-loop): Handle surrogate pair.
+        (utf-16be-encode-loop): Likewise.
+        (ccl-encode-mule-utf-16le-with-signature): Adjusted for the change
+        of utf-16le-encode-loop.
+        (ccl-encode-mule-utf-16be-with-signature): Adjusted for the change
+        of utf-16be-encode-loop.
+        (mule-utf-16-post-read-conversion): Call
+        utf-8-post-read-conversion at first.
+        (mule-utf-16[{le|be}], mule-utf-16{le|be}-with-signature): Include
+        CJK charsets in safe-charsets if utf-translate-cjk-mode is on.
+        Add post-read-conversion and pre-write-conversion.
+
+        * international/utf-8.el (utf-translate-cjk-charsets): New
+        variable.
+        (utf-translate-cjk-unicode-range): New variable.
+        (utf-translate-cjk-load-tables): New function.
+        (utf-lookup-subst-table-for-decode): New function.
+        (utf-lookup-subst-table-for-encode): New function.
+        (utf-translate-cjk-mode): Init-value changed to t.  Don't load
+        tables here.  Update safe-charsets of utf-* coding systems.
+        (ccl-mule-utf-untrans): New CCL.
+        (ccl-decode-mule-utf-8): Call ccl-mule-utf-untrans.  Use `repeat'
+        at end of each branch.
+        (ccl-mule-utf-8-encode-untrans): New CCL.
+        (ccl-encode-mule-utf-8): Call ccl-mule-utf-8-encode-untrans.
+        (ccl-untranslated-to-ucs): Handle 2-byte encoding.  Set r1 to the
+        length of encoding.  Don't return r0.
+        (utf-8-compose): New arg hash-table.  Handle 2-byte encoding.
+        (utf-8-post-read-conversion): Narrow to region properly.  If
+        utf-translate-cjk-mode is on, load tables if necessary.  Call
+        utf-8-compose with hash-table arg if necessary.  Call
+        XXX-compose-region instead of XXX-post-read-convesion.
+        (utf-8-pre-write-conversion): New function.
+        (mule-utf-8): Include CJK charsets in safe-charsets if
+        utf-translate-cjk-mode is on.  Add pre-write-conversion.
+
+        * international/characters.el: Temporarily set
+        utf-translate-cjk-mode to nil.
+
+        * language/devan-util.el (devanagari-compose-region): Add
+        autoload cookie.
+
+        * international/ccl.el (ccl-dump-call): Fix printing the
+        subroutine name.
+
 2004-06-11  Luc Teirlinck  <teirllm@auburn.edu>
 
         * dired.el (dired-revert): If buffer is marked unmodified before
diff --git a/src/ChangeLog b/src/ChangeLog
index 7d15c93cdf4..b1e541ce49d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,18 @@
+2004-06-12  Kenichi Handa  <handa@m17n.org>
+
+        * ccl.c (CCL_CALL_FOR_MAP_INSTRUCTION): Save eof_ic in
+        ccl_prog_stack_struct and update it.
+        (CCL_INVALID_CMD): If CCL_DEBUG is defined, call ccl_debug_hook.
+        (CCL_READ_CHAR): Get instruction counter from eof_ic, not from
+        ccl->eof_ic on EOF.
+        (ccl_debug_hook): New function.
+        (struct ccl_prog_stack): New member eof_ic.
+        (ccl_driver): Handle EOF in subrountine call correctly.
+
+2004-06-11  Kenichi Handa  <handa@m17n.org>
+
+        * coding.c (decode_coding_string): Check CODING_FINISH_INTERRUPT.
+
 2004-06-11  Kim F. Storm  <storm@cua.dk>
 
         * emacs.c (shut_down_emacs): Inhibit redisplay during shutdown.