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 e1295af..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,
@@ -233,7 +235,8 @@ converted to CNS)."))
                 (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
@@ -255,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