Merge from emacs--devo--0

[bpt/emacs.git] / lisp / language / chinese.el

diff --git a/lisp/language/chinese.el b/lisp/language/chinese.el
index 207f2e1..e5fc264 100644 (file)
--- a/lisp/language/chinese.el
+++ b/lisp/language/chinese.el
@@ -1,7 +1,9 @@
 ;;; chinese.el --- support for Chinese -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 2001, 2003  Free Software Foundation, Inc.
-;; Copyright (C) 1995, 1997, 1998
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 ;; Copyright (C) 2003
@@ -14,7 +16,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -24,8 +26,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -50,7 +52,8 @@
                nil]
   :flags '(ascii-at-eol ascii-at-cntl 7-bit
                        designation locking-shift single-shift init-at-bol)
-  :mime-charset 'iso-2022-cn)
+  :mime-charset 'iso-2022-cn
+  :suitable-for-keyboard t)
 
 (define-coding-system-alias 'chinese-iso-7bit 'iso-2022-cn)
 
@@ -69,7 +72,8 @@
                      chinese-cns11643-6 chinese-cns11643-7)]
   :flags '(ascii-at-eol ascii-at-cntl 7-bit
                        designation locking-shift single-shift init-at-bol)
-  :mime-charset 'iso-2022-cn-ext)
+  :mime-charset 'iso-2022-cn-ext
+  :suitable-for-keyboard t)
 
 \f
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -134,6 +138,7 @@
                  (coding-system chinese-big5 chinese-iso-7bit)
                  (coding-priority chinese-big5 iso-2022-cn chinese-iso-8bit)
                  (input-method . "chinese-py-punct-b5")
+                 (ctext-non-standard-encodings "big5-0")
                  (features china-util)
                  (sample-text . "Cantonese (\e$(Gemk#\e(B,\e$(Gl]N)fc\e(B) \e$ATg3?\e(B, \e$ADc:C\e(B")
                  (documentation . "Support for Chinese Big5 character set.")
@@ -226,9 +231,12 @@ converted to CNS)."))
                 (coding-system chinese-gbk)
                 (coding-priority gbk iso-2022-cn chinese-big5
                                  chinese-iso-8bit) ; fixme?
+                (ctext-non-standard-encodings "gbk-0")          
                 (input-method . "chinese-py-punct") ; fixme?
+                (sample-text . "Chinese (\e$BCfJ8\e(B,\e$BIaDL\e$A;0\e(B,\e$A::So\e(B) \e$(D95\e$B9%\e(B")
                 (features china-util)
-                (documentation . "Support for Chinese GBK character set."))
+                (documentation . "Support for Chinese GBK character set.")
+                (tutorial . "TUTORIAL.cn"))
  '("Chinese"))
 
 ;;; Chinese GB18030
@@ -250,9 +258,11 @@ converted to CNS)."))
                     (coding-priority gb18030 gbk iso-2022-cn chinese-big5
                                      chinese-iso-8bit) ; fixme?
                     (input-method . "chinese-py-punct") ; fixme?
+                    (sample-text . "Chinese (\e$BCfJ8\e(B,\e$BIaDL\e$A;0\e(B,\e$A::So\e(B) \e$(D0_\e$B9%\e(B")
                     (features china-util)
                     (documentation
-                     . "Support for Chinese GB18030 character set."))
+                     . "Support for Chinese GB18030 character set.")
+                    (tutorial . "TUTORIAL.cn"))
  '("Chinese"))
 
 ;; Fixme: add HKSCS