[Emacs-diffs] Changes to emacs/lisp/language/lao-util.el,v

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   08/02/25 01:35:50

Index: lao-util.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/language/lao-util.el,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- lao-util.el 1 Feb 2008 16:01:03 -0000       1.28
+++ lao-util.el 25 Feb 2008 01:35:50 -0000      1.29
@@ -493,20 +493,19 @@
       lao-str)))
 
 ;;;###autoload
-(defun lao-composition-function (pos &optional string)
-  (setq pos (1- pos))
+(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 (and (>= pos 0)
-                (eq (string-match lao-composition-pattern string pos) pos))
+           (if (eq (string-match lao-composition-pattern string from) to)
            (prog1 (match-end 0)
-             (compose-string string pos (match-end 0))))
-      (if (>= pos (point-min))
+                 (compose-string string from (match-end 0))))
          (save-excursion
-           (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)))))))))
 
 ;;;###autoload
 (defun lao-compose-region (from to)