* lisp/progmodes/ruby-mode.el: Bump the version to 1.2.

[gnu-emacs] / lisp / language / chinese.el

diff --git a/lisp/language/chinese.el b/lisp/language/chinese.el
index 0e87d4d8e8c27b764ce233514fda828fb25dde05..782b5a363addb04b69a930a9158fe38f08680762 100644 (file)
--- a/lisp/language/chinese.el
+++ b/lisp/language/chinese.el
@@ -1,6 +1,6 @@
 ;;; chinese.el --- support for Chinese -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
+;; Copyright (C) 2001-2012  Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
@@ -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 . "\