Merge changes from emacs-23 branch.

[bpt/emacs.git] / lisp / language / tv-util.el

diff --git a/lisp/language/tv-util.el b/lisp/language/tv-util.el
index 312ee1f..67ed632 100644 (file)
--- a/lisp/language/tv-util.el
+++ b/lisp/language/tv-util.el
@@ -1,6 +1,6 @@
 ;;; tv-util.el --- support for Tai Viet                        -*- coding: utf-8 -*-
 
-;; Copyright (C) 2007
+;; Copyright (C) 2007, 2008, 2009, 2010
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
 
@@ -8,10 +8,10 @@
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; 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)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,15 +19,12 @@
 ;; GNU General Public License for more details.
 
 ;; 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., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Code
 
 ;; Regexp matching with a sequence of Tai Viet characters.
-(defconst tai-viet-re
-  (format "[\xaa80-\xaac2\xaadb-\xaadf-]+"))
+(defconst tai-viet-re "[\xaa80-\xaac2\xaadb-\xaadf]+")
 
 ;; Char-table of information about glyph type of Tai Viet characters.
 (defconst tai-viet-glyph-info