Merge from emacs--devo--0

[gnu-emacs] / leim / quail / py-punct.el

diff --git a/leim/quail/py-punct.el b/leim/quail/py-punct.el
index b903f214e4f1902fc15e94a5fc39fe7f0e5475f1..4e271c9bf4dfa16b65da746a18625c95c83c42be 100644 (file)
--- a/leim/quail/py-punct.el
+++ b/leim/quail/py-punct.el
@@ -1,7 +1,11 @@
-;; quail/py-punct.el -- Quail packages for Chinese (pinyin + extra symbols)
+;;; py-punct.el --- Quail packages for Chinese (pinyin + extra symbols)  -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 1997 Electrotechnical Laboratory, JAPAN.
-;; Licensed to the Free Software Foundation.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 
 ;; Author: Ken'ichi HANDA <handa@etl.go.jp>
 
@@ -21,8 +25,12 @@
 
 ;; 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:
+
+;;; Code:
 
 (require 'quail)
 
@@ -43,7 +51,7 @@ For instance, typing `v' and `%' insert `\e$A#%\e(B'.
 ")
 
 (setcar (nthcdr 2 quail-current-package)
-       (nth 2 (assoc "chinese-py" quail-package-alist)))
+       (copy-sequence (nth 2 (assoc "chinese-py" quail-package-alist))))
 
 (quail-defrule "v" (nth 2 (assoc "chinese-punct" quail-package-alist)))
 
@@ -64,4 +72,10 @@ by any key sequences defined in `chinese-punct'.
 For instance, typing `v' and `%' insert `\e$A#%\e(B'.
 ")
 
-(quail-defrule "v" (nth 2 (assoc "chinese-punct-b5" quail-package-alist)))
+(setcar (nthcdr 2 quail-current-package)
+       (copy-sequence (nth 2 (assoc "chinese-tonepy" quail-package-alist))))
+
+(quail-defrule "v" (nth 2 (assoc "chinese-punct" quail-package-alist)))
+
+;;; arch-tag: 941fd2ac-2d26-4b0e-8458-b5e485c5aa7d
+;;; py-punct.el ends here