aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2008-12-01 11:07:41 +0000
committerJuanma Barranquero2008-12-01 11:07:41 +0000
commitd6be7497c49ada1ab25c2dd00a39d9392284aac1 (patch)
tree06846ae634965f6d7ae6d2598411aa17980e1600
parentfa687b02e94dfbe7c9491c8a8c5ccbbe577fd4aa (diff)
downloademacs-d6be7497c49ada1ab25c2dd00a39d9392284aac1.tar.gz
emacs-d6be7497c49ada1ab25c2dd00a39d9392284aac1.zip
* international/mule-cmds.el (locale-preferred-coding-systems): Fix alist item.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/international/mule-cmds.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index efb33f53d3f..ae0b129e122 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12008-12-01 Juanma Barranquero <lekktu@gmail.com>
2
3 * international/mule-cmds.el (locale-preferred-coding-systems):
4 Fix alist item.
5
12008-12-01 Michael Albinus <michael.albinus@gmx.de> 62008-12-01 Michael Albinus <michael.albinus@gmx.de>
2 7
3 * net/tramp-cache.el (tramp-cache-data-changed): New defvar. 8 * net/tramp-cache.el (tramp-cache-data-changed): New defvar.
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index a367e6133ef..9222b19c384 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -2365,7 +2365,7 @@ This language name is used if the locale is not listed in
2365 ("big5[-_]?hkscs" . big5-hkscs) 2365 ("big5[-_]?hkscs" . big5-hkscs)
2366 ("big5" . big5) 2366 ("big5" . big5)
2367 ("euc-?tw" . euc-tw) 2367 ("euc-?tw" . euc-tw)
2368 ("euc-?cn" .euc-cn) 2368 ("euc-?cn" . euc-cn)
2369 ("gb2312" . gb2312) 2369 ("gb2312" . gb2312)
2370 ("gbk" . gbk) 2370 ("gbk" . gbk)
2371 ("gb18030" . gb18030) 2371 ("gb18030" . gb18030)