Merge from emacs-24; up to 2012-05-02T07:12:52Z!rgm@gnu.org.

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

diff --git a/lisp/language/tibet-util.el b/lisp/language/tibet-util.el
index 88f970e57049f7756298f9c6acf98a7c5ae0af81..f6dd15bf222674027ef1a8d00bc55b7cde9900fe 100644 (file)
--- a/lisp/language/tibet-util.el
+++ b/lisp/language/tibet-util.el
@@ -1,20 +1,21 @@
 ;;; tibet-util.el --- utilities for Tibetan   -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001-2012  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
 
+;; Author: Toru TOMABECHI <Toru.Tomabechi@orient.unil.ch>
 ;; Keywords: multilingual, Tibetan
+;; Created: Feb. 17. 1997
 
 ;; 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 3, 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
@@ -22,17 +23,11 @@
 ;; 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.
-
-;; Author: Toru TOMABECHI, <Toru.Tomabechi@orient.unil.ch>
-
-;; Created: Feb. 17. 1997
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; History:
 ;; 1997.03.13 Modification in treatment of text properties;
-;;            Support for some special signs and punctuations.
+;;            Support for some special signs and punctuation.
 ;; 1999.10.25 Modification for a new composition way by K.Handa.
 
 ;;; Commentary:
@@ -315,23 +310,6 @@ are decomposed into normal Tibetan character sequences."
            idx (1+ idx)))
     new))
 
-;;;###autoload
-(defun tibetan-composition-function (pos &optional string)
-  (if string
-      (if auto-compose-current-font
-         (if (eq (string-match "[\e$(7!0\e(B-\e$,1GQ\e(B]+" pos) pos)
-             (or (font-shape-text 0 (match-end 0) auto-compose-current-font
-                                  string)
-                 pos)))
-    (goto-char pos)
-    (if auto-compose-current-font
-       (if (looking-at "[\e$(7!0\e(B-\e$,1GQ\e(B]+")
-           (or (font-shape-text pos (match-end 0) auto-compose-current-font)
-               pos)
-         (if (looking-at tibetan-composable-pattern)
-             (prog1 (match-end 0)
-               (tibetan-compose-region pos (match-end 0))))))))
-
 ;;;
 ;;; This variable is used to avoid repeated decomposition.
 ;;;
@@ -420,7 +398,7 @@ See also docstring of the function tibetan-compose-region."
        ))))
 
 (defvar tibetan-strict-unicode t
-  "*Flag to control Tibetan canonicalizing for Unicode.
+  "Flag to control Tibetan canonicalizing for Unicode.
 
 If non-nil, the vowel a is removed and composite vowels are decomposed
 before writing buffer in Unicode.  See also
@@ -442,5 +420,4 @@ before writing buffer in Unicode.  See also
 
 (provide 'tibet-util)
 
-;;; arch-tag: 7a7333e8-1584-446c-b39c-a02b9def265d
 ;;; tibet-util.el ends here