merge trunk

[gnu-emacs] / lisp / language / china-util.el

diff --git a/lisp/language/china-util.el b/lisp/language/china-util.el
index 64b305a41221906d241e34f838851c789ad3b0af..7ef842ce66cde7406114832d561d273c41099658 100644 (file)
--- a/lisp/language/china-util.el
+++ b/lisp/language/china-util.el
@@ -1,9 +1,8 @@
-;;; china-util.el --- utilities for Chinese  -*- coding: iso-2022-7bit -*-
+;;; china-util.el --- utilities for Chinese  -*- coding: utf-8 -*-
 
-;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2001-2013 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008
+;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 ;; Copyright (C) 2003
@@ -191,5 +190,4 @@ Return the length of resulting text."
 ;;
 (provide 'china-util)
 
-;; arch-tag: 5a47b084-b9ac-420e-8191-70c5b3a14836
 ;;; china-util.el ends here