Mercurial > emacs
changeset 91277:0dfd79b5e5c5
(tai-viet-composition-function): Fix
arguments.
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Tue, 25 Dec 2007 10:50:26 +0000 |
parents | 1d8d51129d26 |
children | ac0200dcbfdd |
files | lisp/language/tv-util.el |
diffstat | 1 files changed, 7 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- 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)