Don't setup composition-function-table here.

("Devanagari"): Change charset, coding-system, coding-priority to
Unicode-based ones.  Don't require the feature devan-util.

diff --git a/lisp/language/devanagari.el b/lisp/language/devanagari.el
index 52bdbc0b09b5fa7b58dab4dd0bb2cc8d6acef37f..4cf95fde994df8efdb39748d248f21cdcb784041 100644 (file)
--- a/lisp/language/devanagari.el
+++ b/lisp/language/devanagari.el
@@ -31,25 +31,15 @@
 ;;; Code:
 
 (set-language-info-alist
- "Devanagari" '((charset indian-is13194 mule-unicode-0100-24ff
-                         indian-2-column indian-glyph ;; comment out later
-                         )
-               (coding-system in-is13194-devanagari)
-               (coding-priority in-is13194-devanagari)
+ "Devanagari" '((charset unicode)
+               (coding-system utf-8)
+               (coding-priority utf-8)
                (input-method . "dev-aiba")
-               (features devan-util)
                (documentation . "\
 Such languages using Devanagari script as Hindi and Marathi
 are supported in this language environment."))
  '("Indian"))
 
-;; For automatic composition.
-(dolist (range '((#x0903 . #x0903)
-                (#x0905 . #x0939)
-                (#x0958 . #x0961)))
-  (set-char-table-range composition-function-table range
-                       '(("[\x0900-\x097F]+" . font-shape-text))))
-
 (provide 'devanagari)
 
 ;;; arch-tag: fd13667d-868b-41e8-81ef-79dd28bbfed2