aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenichi Handa2006-11-27 07:39:29 +0000
committerKenichi Handa2006-11-27 07:39:29 +0000
commitf21605fa6e613d0460bd6c7090a1c1789a2813cc (patch)
tree4c2033cf74c501d94194a30bee59e4ccd9f30048
parentb1e21c64e593b7da84fec9df8c1c069c81b235ae (diff)
downloademacs-f21605fa6e613d0460bd6c7090a1c1789a2813cc.tar.gz
emacs-f21605fa6e613d0460bd6c7090a1c1789a2813cc.zip
(locale-language-names): Add an entry
for "zh_CN.UTF-8" and change "chs" to "Chinese-GBK".
-rw-r--r--lisp/international/mule-cmds.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 8f0de253a15..e0e7e8512c8 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -2266,6 +2266,7 @@ Setting this variable directly does not take effect. See
2266 ("zh_CN.GB2312" "Chinese-GB") 2266 ("zh_CN.GB2312" "Chinese-GB")
2267 ("zh_CN.GBK" "Chinese-GBK") 2267 ("zh_CN.GBK" "Chinese-GBK")
2268 ("zh_CN.GB18030" "Chinese-GB18030") 2268 ("zh_CN.GB18030" "Chinese-GB18030")
2269 ("zh_CN.UTF-8" . "Chinese-GBK")
2269 ("zh_CN" . "Chinese-GB") 2270 ("zh_CN" . "Chinese-GB")
2270 ("zh" . "Chinese-GB") 2271 ("zh" . "Chinese-GB")
2271 ("zu" . "Latin-1") ; Zulu 2272 ("zu" . "Latin-1") ; Zulu
@@ -2285,7 +2286,7 @@ Setting this variable directly does not take effect. See
2285 ("sp" . "Cyrillic-ISO") ; Serbian (Cyrillic alphabet), e.g. X11R6.4 2286 ("sp" . "Cyrillic-ISO") ; Serbian (Cyrillic alphabet), e.g. X11R6.4
2286 ("su" . "Latin-1") ; Finnish, e.g. Solaris 2.6 2287 ("su" . "Latin-1") ; Finnish, e.g. Solaris 2.6
2287 ("jp" . "Japanese") ; e.g. MS Windows 2288 ("jp" . "Japanese") ; e.g. MS Windows
2288 ("chs" . "Chinese-GB") ; MS Windows Chinese Simplified 2289 ("chs" . "Chinese-GBK") ; MS Windows Chinese Simplified
2289 ("cht" . "Chinese-BIG5") ; MS Windows Chinese Traditional 2290 ("cht" . "Chinese-BIG5") ; MS Windows Chinese Traditional
2290 ("gbz" . "UTF-8") ; MS Windows Dari Persian 2291 ("gbz" . "UTF-8") ; MS Windows Dari Persian
2291 ("div" . "UTF-8") ; MS Windows Divehi (Maldives) 2292 ("div" . "UTF-8") ; MS Windows Divehi (Maldives)