From: Kenichi Handa <handa@m17n.org>
Date: Tue, 25 Dec 2007 10:50:26 +0000 (+0000)
Subject: (tai-viet-composition-function): Fix
X-Git-Tag: emacs-pretest-23.0.90~8295^2~92
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=268dff94121d96d8a096f4910c5ed7aa1e0722be;p=emacs.git

(tai-viet-composition-function): Fix
arguments.
---

diff --git a/lisp/language/tv-util.el b/lisp/language/tv-util.el
index c7e8f8da97e..312ee1f41a3 100644
--- a/lisp/language/tv-util.el
+++ b/lisp/language/tv-util.el
@@ -131,17 +131,13 @@
 
 
 ;;;###autoload
-(defun tai-viet-composition-function (pos &optional string)
-  (let (to)
-    (if string
-	(progn
-	  (if (string-match tai-viet-re string pos)
-	      (tai-viet-compose-string pos (match-end 0) string)
-	    (1+ pos)))
-      (goto-char pos)
-      (if (looking-at tai-viet-re)
-	  (tai-viet-compose-region pos (match-end 0))
-	(1+ pos)))))
+(defun tai-viet-composition-function (from to font-object string)
+  (if string
+      (if (string-match tai-viet-re string from)
+	  (tai-viet-compose-string from (match-end 0) string))
+    (goto-char from)
+    (if (looking-at tai-viet-re)
+	(tai-viet-compose-region from (match-end 0)))))
 
 ;;
 (provide 'tai-viet-util)