changeset 73349:43ccf7c7d312

* international/utf-8.el (utf-translate-cjk-load-tables): Avoid clobbering last-coding-system-used during load.
author Chong Yidong <cyd@stupidchicken.com>
date Fri, 13 Oct 2006 01:41:11 +0000
parents c51c8fa9c1f1
children 1a3368a80879
files lisp/ChangeLog lisp/international/utf-8.el
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Thu Oct 12 23:00:44 2006 +0000
+++ b/lisp/ChangeLog	Fri Oct 13 01:41:11 2006 +0000
@@ -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
--- a/lisp/international/utf-8.el	Thu Oct 12 23:00:44 2006 +0000
+++ b/lisp/international/utf-8.el	Fri Oct 13 01:41:11 2006 +0000
@@ -309,7 +309,10 @@
     ;; 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")