From: Kenichi Handa <handa@m17n.org> Date: Tue, 4 Dec 2007 06:07:44 +0000 (+0000) Subject: (devanagari-composition-function): Use X-Git-Tag: emacs-pretest-23.0.90~8295^2~186 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3240618b729d06247e937f750aab2eadaac99d15;p=emacs.git (devanagari-composition-function): Use font-shape-text if auto-compose-current-font is non-nil. --- diff --git a/lisp/language/devan-util.el b/lisp/language/devan-util.el index 8b10d6650c8..3d2efce9224 100644 --- a/lisp/language/devan-util.el +++ b/lisp/language/devan-util.el @@ -115,18 +115,19 @@ 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 devanagari-composable-pattern pos) pos) - (if auto-compose-current-font + (if auto-compose-current-font + (if (eq (string-match "[$,15@(B-$,16_(B]+" pos) pos) (or (font-shape-text 0 (match-end 0) auto-compose-current-font string) pos))) (goto-char pos) - (if (looking-at devanagari-composable-pattern) - (if auto-compose-current-font + (if auto-compose-current-font + (if (looking-at "[$,15@(B-$,16_(B]+") (or (font-shape-text pos (match-end 0) auto-compose-current-font) pos) - (prog1 (match-end 0) - (devanagari-compose-syllable-region pos (match-end 0))))))) + (if (looking-at devanagari-composable-pattern) + (prog1 (match-end 0) + (devanagari-compose-syllable-region pos (match-end 0)))))))) ;; Notes on conversion steps.