language/chinese.el ("Chinese-GB", "Chinese-BIG5", "Chinese-CNS", "Chinese-EUC-TW...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index af91cfffba44df0ae20270c5fc964d5a48c3a2c6..6b132bb913447384cd1df61c000e711c165af0ae 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-13  Kenichi Handa  <handa@gnu.org>
+
+       * language/chinese.el ("Chinese-GB", "Chinese-BIG5")
+       ("Chinese-CNS", "Chinese-EUC-TW"): Add chinese-gbk to
+       `coding-priority' property of these language environment.
+
 2012-09-13  Paul Eggert  <eggert@cs.ucla.edu>
 
        Fix glitches caused by addition of psec to timers (Bug#12430).

diff --git a/lisp/language/chinese.el b/lisp/language/chinese.el
index ac2afa373c40864b48c40acb08c5551f3e66cb1e..782b5a363addb04b69a930a9158fe38f08680762 100644 (file)
--- a/lisp/language/chinese.el
+++ b/lisp/language/chinese.el
@@ -110,7 +110,8 @@
                                    (use-cjk-char-width-table 'zh_CN)))
                (exit-function . use-default-char-width-table)
                (coding-system chinese-iso-8bit iso-2022-cn chinese-hz)
-               (coding-priority chinese-iso-8bit chinese-big5 iso-2022-cn)
+               (coding-priority chinese-iso-8bit chinese-gbk chinese-big5
+                                iso-2022-cn)
                (input-method . "chinese-py-punct")
                (features china-util)
                (sample-text . "Chinese (\e$AVPND\e(B,\e$AFUM(;0\e(B,\e$A::So\e(B)    \e$ADc:C\e(B")
@@ -140,7 +141,8 @@
                                      (use-cjk-char-width-table 'zh_HK)))
                  (exit-function . use-default-char-width-table)
                  (coding-system chinese-big5 chinese-iso-7bit)
-                 (coding-priority chinese-big5 iso-2022-cn chinese-iso-8bit)
+                 (coding-priority chinese-big5 iso-2022-cn chinese-iso-8bit
+                                  chinese-gbk)
                  (input-method . "chinese-py-punct-b5")
                  (ctext-non-standard-encodings "big5-0")
                  (features china-util)
@@ -196,7 +198,7 @@
                 (exit-function . use-default-char-width-table)
                 (coding-system iso-2022-cn euc-tw)
                 (coding-priority iso-2022-cn euc-tw chinese-big5
-                                 chinese-iso-8bit)
+                                 chinese-iso-8bit chinese-gbk)
                 (features china-util)
                 (input-method . "chinese-cns-quick")
                 ;; Fixme: presumably it won't accept big5 now.
@@ -216,7 +218,7 @@ accepts Big5 for input also (which is then converted to CNS)."))
                    (exit-function . use-default-char-width-table)
                    (coding-system euc-tw iso-2022-cn)
                    (coding-priority euc-tw chinese-big5 iso-2022-cn
-                                    chinese-iso-8bit)
+                                    chinese-iso-8bit chinese-gbk)
                    (features china-util)
                    (input-method . "chinese-cns-quick")
                    (documentation . "\