From 33e2c0dadbb1ee191936d5bf6b521f4e0d63d2ec Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Thu, 6 Dec 2007 07:33:28 +0000 Subject: [PATCH] (tamil-composition-function): Use font-shape-text if auto-compose-current-font is non-nil. --- lisp/language/tml-util.el | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lisp/language/tml-util.el b/lisp/language/tml-util.el index 84e00f1fa89..58f32897f0d 100644 --- a/lisp/language/tml-util.el +++ b/lisp/language/tml-util.el @@ -360,17 +360,18 @@ If STRING is not nil, it is a string, and POS is an index to the string. In this case, compose characters after POS of the string." (if string - (if (eq (string-match tamil-composable-pattern pos) pos) - (if auto-compose-current-font + (if auto-compose-current-font + (if (eq (string-match "[$,1< (B-$,1=?(B]+" pos) pos) (or (font-shape-text 0 (match-end 0) auto-compose-current-font string) pos))) (goto-char pos) - (if (looking-at tamil-composable-pattern) - (if auto-compose-current-font + (if auto-compose-current-font + (if (looking-at "[$,1< (B-$,1=?(B]+") (or (font-shape-text pos (match-end 0) auto-compose-current-font)) - (prog1 (match-end 0) - (tamil-compose-syllable-region pos (match-end 0))))))) + (if (looking-at tamil-composable-pattern) + (prog1 (match-end 0) + (tamil-compose-syllable-region pos (match-end 0)))))))) (provide 'tml-util) -- 2.39.5