(cjk-codepages-alist): Add associations for

Chinese and Korean codepages.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 75adc06fd7d315e5b711777ea7d2f9b4f72fa69c..a3a033a891dbb863e9b358f52626fe47f5340f49 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-04  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * term/internal.el (cjk-codepages-alist): Add associations for
+       Chinese and Korean codepages.  Remove FIXME comment.
+
 2000-05-03  Dave Love  <fx@gnu.org>
 
        * time.el (display-time-mail-face, display-time-use-mail-icon):

diff --git a/lisp/term/internal.el b/lisp/term/internal.el
index 7568510bfeb931c5f5c11f3dacf0f15ecd64faf0..afc5faa2d0331dd99a63afcb716635ad1c167127 100644 (file)
--- a/lisp/term/internal.el
+++ b/lisp/term/internal.el
@@ -327,11 +327,11 @@ display tables, and the language environment options as appropriate."
     (run-hooks 'dos-codepage-setup-hook)
     ))
 
-;; FIXME: Korean and Chinese codepages should be added here, but I
-;; don't know what coding systems do they support.  The codepages in
-;; point are 934, 936, 938, 944, and 948.
 (defvar cjk-codepages-alist
-  '((932 "Japanese" japanese-shift-jis))
+  '((932 "Japanese" japanese-shift-jis)
+    (950 "Chinese-BIG5" cn-big5)
+    (936 "Chinese-GB" cn-gb-2312)
+    (949 "Korean" euc-kr))
   "An alist of Far-Eastern codepages and the names of the associated
 language and supported coding system.")
 
@@ -355,7 +355,7 @@ list.  You can (and should) also run it whenever the value of
       ;; MULE native coding systems directly.
       (setq coding-dos (intern (format "%s-dos" coding))
            coding-unix (intern (format "%s-unix" coding)))
-      (set-language-environment (car desc))
+      (set-language-environment lang)
       (set-selection-coding-system coding-dos)
       (setq file-name-coding-system coding-unix)
       (set-terminal-coding-system