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

[Kenichi Handa]

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

Index: tibet-util.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/language/tibet-util.el,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- tibet-util.el       1 Feb 2008 16:01:01 -0000       1.40
+++ tibet-util.el       25 Feb 2008 01:38:06 -0000      1.41
@@ -316,21 +316,12 @@
     new))
 
 ;;;###autoload
-(defun tibetan-composition-function (pos &optional string)
+(defun tibetan-composition-function (from to font-object string)
+  (or (and font-object
+          (font-shape-text from to font-object string))
   (if string
-      (if auto-compose-current-font
-         (if (eq (string-match "[$(7!0(B-$,1GQ(B]+" pos) pos)
-             (or (font-shape-text 0 (match-end 0) auto-compose-current-font
-                                  string)
-                 pos)))
-    (goto-char pos)
-    (if auto-compose-current-font
-       (if (looking-at "[$(7!0(B-$,1GQ(B]+")
-           (or (font-shape-text pos (match-end 0) auto-compose-current-font)
-               pos)
-         (if (looking-at tibetan-composable-pattern)
-             (prog1 (match-end 0)
-               (tibetan-compose-region pos (match-end 0))))))))
+         (tibetan-compose-string string)
+       (tibetan-compose-region from to))))
 
 ;;;
 ;;; This variable is used to avoid repeated decomposition.