# HG changeset patch # User Kenichi Handa # Date 1198579826 0 # Node ID 0dfd79b5e5c52e6e7987f065b9546adfafe9ae86 # Parent 1d8d51129d26016e302e6e77440399974a367fb1 (tai-viet-composition-function): Fix arguments. diff -r 1d8d51129d26 -r 0dfd79b5e5c5 lisp/language/tv-util.el --- a/lisp/language/tv-util.el Tue Dec 25 10:49:50 2007 +0000 +++ b/lisp/language/tv-util.el Tue Dec 25 10:50:26 2007 +0000 @@ -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)