(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 8b10d6650c8a150882c4b39f41263f188660b78d..3d2efce922488beb2a9ddf0200eaef427602e65c 100644 (file)
--- 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 "[\e$,15@\e(B-\e$,16_\e(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 "[\e$,15@\e(B-\e$,16_\e(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.