aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2006-04-08 09:53:18 +0000
committerEli Zaretskii2006-04-08 09:53:18 +0000
commit569a6374dc85b56c4fc16cec4c5724d71ad02ae6 (patch)
treee24e64a9222c30bf7c2435cd17e675cdec1534da
parentcdb1af304e5b900c0f357b0010267c87f4c15fde (diff)
downloademacs-569a6374dc85b56c4fc16cec4c5724d71ad02ae6.tar.gz
emacs-569a6374dc85b56c4fc16cec4c5724d71ad02ae6.zip
(locale-language-names): Add a few MS Windows language codes.
-rw-r--r--lisp/ChangeLog1
-rw-r--r--lisp/international/mule-cmds.el5
2 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 47a76ae10d0..997fe506661 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,7 @@
3 * international/mule-cmds.el (set-locale-environment): Make sure 3 * international/mule-cmds.el (set-locale-environment): Make sure
4 the coding-system preferred by the locale's language has the same 4 the coding-system preferred by the locale's language has the same
5 EOL conversion type as the original buffer-file-coding-system. 5 EOL conversion type as the original buffer-file-coding-system.
6 (locale-language-names): Add a few MS Windows language codes.
6 7
72006-04-07 Richard Stallman <rms@gnu.org> 82006-04-07 Richard Stallman <rms@gnu.org>
8 9
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 7aebc4928ab..17004f6bcd5 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -2135,6 +2135,7 @@ of `buffer-file-coding-system' set by this function."
2135 ("cy" "Welsh" iso-8859-14) 2135 ("cy" "Welsh" iso-8859-14)
2136 ("da" . "Latin-1") ; Danish 2136 ("da" . "Latin-1") ; Danish
2137 ("de" "German" iso-8859-1) 2137 ("de" "German" iso-8859-1)
2138 ; dv Divehi
2138 ; dz Bhutani 2139 ; dz Bhutani
2139 ("el" "Greek" iso-8859-7) 2140 ("el" "Greek" iso-8859-7)
2140 ;; Users who specify "en" explicitly typically want Latin-1, not ASCII. 2141 ;; Users who specify "en" explicitly typically want Latin-1, not ASCII.
@@ -2296,6 +2297,10 @@ of `buffer-file-coding-system' set by this function."
2296 ("jp" . "Japanese") ; e.g. MS Windows 2297 ("jp" . "Japanese") ; e.g. MS Windows
2297 ("chs" . "Chinese-GB") ; MS Windows Chinese Simplified 2298 ("chs" . "Chinese-GB") ; MS Windows Chinese Simplified
2298 ("cht" . "Chinese-BIG5") ; MS Windows Chinese Traditional 2299 ("cht" . "Chinese-BIG5") ; MS Windows Chinese Traditional
2300 ("gbz" . "UTF-8") ; MS Windows Dari Persian
2301 ("div" . "UTF-8") ; MS Windows Divehi (Maldives)
2302 ("wee" . "Latin-2") ; MS Windows Lower Sorbian
2303 ("wen" . "Latin-2") ; MS Windows Upper Sorbian
2299 )) 2304 ))
2300 "Alist of locale regexps vs the corresponding languages and coding systems. 2305 "Alist of locale regexps vs the corresponding languages and coding systems.
2301Each element has these form: 2306Each element has these form: