From: Kenichi Handa <handa@m17n.org>
Date: Sat, 1 Dec 2007 04:20:22 +0000 (+0000)
Subject: (devanagari-composition-function): Use
X-Git-Tag: emacs-pretest-23.0.90~8295^2~213
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=77aba77ecbf35f2d4a2fb6232b76437203f819c5;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 41d7937493c..8b10d6650c8 100644
--- a/lisp/language/devan-util.el
+++ b/lisp/language/devan-util.el
@@ -115,12 +115,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
-      ;; Not yet implemented.
-      nil
+      (if (eq (string-match devanagari-composable-pattern pos) pos)
+	  (if auto-compose-current-font
+	      (or (font-shape-text 0 (match-end 0) auto-compose-current-font
+				   string)
+		  pos)))
     (goto-char pos)
     (if (looking-at devanagari-composable-pattern)
-	(prog1 (match-end 0)
-	  (devanagari-compose-syllable-region pos (match-end 0))))))
+	(if auto-compose-current-font
+	    (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)))))))
 
 ;; Notes on conversion steps.