* international/utf-8.el (utf-translate-cjk-load-tables): Avoid

	clobbering last-coding-system-used during load.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0257de0c42089da64468bb320a3a6920ce2cec38..fc45f2356090bc33e90c48d7035988bf5c942667 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-12  Chong Yidong  <cyd@stupidchicken.com>
+
+       * international/utf-8.el (utf-translate-cjk-load-tables): Avoid
+       clobbering last-coding-system-used during load.
+
 2006-10-12  Carsten Dominik  <dominik@science.uva.nl>
 
        * textmodes/reftex-global.el (reftex-create-tags-file): Quote file

diff --git a/lisp/international/utf-8.el b/lisp/international/utf-8.el
index 384d973db9fdf87d021df4dc6a598e6e7d051c7a..7a57a3d099b5206e8ac28aa5426dc6b87526bbaf 100644 (file)
--- a/lisp/international/utf-8.el
+++ b/lisp/international/utf-8.el
@@ -309,7 +309,10 @@ use either \\[customize] or the function
     ;; Here we bind coding-system-for-read to nil so that coding tags
     ;; in the files are respected even if the files are not yet
     ;; byte-compiled
-    (let ((coding-system-for-read nil))
+    (let ((coding-system-for-read nil)
+         ;; We must avoid clobbering this variable, in case the load
+         ;; files below use different coding systems.
+         (last-coding-system-used last-coding-system-used))
       (cond ((string= "Korean" current-language-environment)
             (load "subst-jis")
             (load "subst-big5")