Commit 446465b9 authored by Kenichi Handa's avatar Kenichi Handa
Browse files

(lao-composition-function): Adjusted for the new calling way.

parent 622c2a53
......@@ -493,20 +493,19 @@ syllable. In that case, FROM and TO are indexes to STR."
(defun lao-composition-function (pos &optional string)
(setq pos (1- pos))
(with-category-table lao-category-table
(if string
(if (and (>= pos 0)
(eq (string-match lao-composition-pattern string pos) pos))
(prog1 (match-end 0)
(compose-string string pos (match-end 0))))
(if (>= pos (point-min))
(defun lao-composition-function (from to font-object string)
(or (and font-object
(font-shape-text from to font-object string))
(with-category-table lao-category-table
(if string
(if (eq (string-match lao-composition-pattern string from) to)
(prog1 (match-end 0)
(compose-string string from (match-end 0))))
(goto-char pos)
(goto-char from)
(if (looking-at lao-composition-pattern)
(prog1 (match-end 0)
(compose-region pos (match-end 0)))))))))
(compose-region from (match-end 0)))))))))
(defun lao-compose-region (from to)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment