Delete the setting for indian-1-column

and add the setting for indian-glyph in the default fontset.

diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index 7baa89ae66cb1326a8d01419eb215457c70883dd..bf95f60cd23134cff1a92c33c5f1b1079a420fb5 100644 (file)
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -77,7 +77,6 @@
           (ascii-right-to-left . (nil . "ISO8859-1"))
           (indian-is13194 . ("*" . "IS13194-Devanagari"))
           (indian-2-column . ("*" . "MuleIndian-2"))
-          (indian-1-column . ("*" . "MuleIndian-1"))
           (lao . ("*" . "MuleLao-1"))
           (tibetan . ("proportional" . "MuleTibetan-2"))
           (tibetan-1-column . ("*" . "MuleTibetan-1"))
@@ -88,6 +87,33 @@
           (mule-unicode-e000-ffff . (nil . "ISO10646-1"))
           (japanese-jisx0213-1 . ("*" . "JISX0213.2000-1"))
           (japanese-jisx0213-2 . ("*" . "JISX0213.2000-2"))
+           ;; unicode
+           ((,(decode-char 'ucs #x0900)
+            . ,(decode-char 'ucs #x097F)) . ("*" . "ISO10646.indian-1"))
+           ;; indian
+          (indian-glyph . ("*" . "Devanagari-CDAC"))
+          ((,(indian-glyph-char 0 'devanagari)
+            . ,(indian-glyph-char 255 'devanagari)) . ("*" . "Devanagari-CDAC"))
+          ((,(indian-glyph-char 0 'sanskrit)
+            . ,(indian-glyph-char 255 'sanskrit)) . ("*" . "Sanskrit-CDAC"))
+          ((,(indian-glyph-char 0 'bengali)
+            . ,(indian-glyph-char 255 'bengali)) . ("*" . "Bengali-CDAC"))
+          ((,(indian-glyph-char 0 'assamese)
+            . ,(indian-glyph-char 255 'assamese)) . ("*" . "Assamese-CDAC"))
+          ((,(indian-glyph-char 0 'punjabi)
+            . ,(indian-glyph-char 255 'punjabi)) . ("*" . "Punjabi-CDAC"))
+          ((,(indian-glyph-char 0 'gujarati)
+            . ,(indian-glyph-char 255 'gujarati)) . ("*" . "Gujarati-CDAC"))
+          ((,(indian-glyph-char 0 'oriya)
+            . ,(indian-glyph-char 255 'oriya)) . ("*" . "Oriya-CDAC"))
+          ((,(indian-glyph-char 0 'tamil)
+            . ,(indian-glyph-char 255 'tamil)) . ("*" . "Tamil-CDAC"))
+          ((,(indian-glyph-char 0 'telugu)
+            . ,(indian-glyph-char 255 'telugu)) . ("*" . "Telugu-CDAC"))
+          ((,(indian-glyph-char 0 'kannada)
+            . ,(indian-glyph-char 255 'kannada)) . ("*" . "Kannada-CDAC"))
+          ((,(indian-glyph-char 0 'malayalam)
+            . ,(indian-glyph-char 255 'malayalam)) . ("*" . "Malayalam-CDAC"))
           ))
       charset font-spec arg)
   (while l