summaryrefslogtreecommitdiff
path: root/lisp/language
diff options
context:
space:
mode:
authorKenichi Handa <handa@m17n.org>2007-12-25 10:50:26 +0000
committerKenichi Handa <handa@m17n.org>2007-12-25 10:50:26 +0000
commit268dff94121d96d8a096f4910c5ed7aa1e0722be (patch)
treea2756227798e211aaea54195d56ce3c23b64dd98 /lisp/language
parent00ddf712fb0a2ebf63d238024322f180d8ae950c (diff)
downloademacs-268dff94121d96d8a096f4910c5ed7aa1e0722be.tar.gz
emacs-268dff94121d96d8a096f4910c5ed7aa1e0722be.tar.bz2
emacs-268dff94121d96d8a096f4910c5ed7aa1e0722be.zip
(tai-viet-composition-function): Fix
arguments.
Diffstat (limited to 'lisp/language')
-rw-r--r--lisp/language/tv-util.el18
1 files changed, 7 insertions, 11 deletions
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)