Merge from emacs--devo--0

[gnu-emacs] / lisp / language / devanagari.el

diff --git a/lisp/language/devanagari.el b/lisp/language/devanagari.el
index c337ecb2a4f45b46e37efd74c25557fe25e8f767..46ed04145043b130202b7bc48818b015534877c8 100644 (file)
--- a/lisp/language/devanagari.el
+++ b/lisp/language/devanagari.el
@@ -34,8 +34,8 @@
  "Devanagari" '((charset indian-is13194 mule-unicode-0100-24ff
                          indian-2-column indian-glyph ;; comment out later
                          )
-               (coding-system in-is13194)
-               (coding-priority in-is13194)
+               (coding-system in-is13194-devanagari)
+               (coding-priority in-is13194-devanagari)
                (input-method . "dev-aiba")
                (features devan-util)
                (documentation . "\
@@ -43,6 +43,13 @@ 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
+                       'devanagari-composition-function))
+
 (provide 'devanagari)
 
 ;;; arch-tag: fd13667d-868b-41e8-81ef-79dd28bbfed2