Merged from miles@gnu.org--gnu-2005 (patch 279-280)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-279
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-280
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-335

3 files changed, 122 insertions, 19 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 834dcf4ab82..9fc43e0bd4a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2005-04-26  Kenichi Handa  <handa@m17n.org>
+
+        * fns.c (char_table_range): New function.
+        (Fchar_table_range): Signal an error if characters in the range
+        have inconsistent values.  Don't check the parent.
+
+2005-04-25  Kenichi Handa  <handa@m17n.org>
+
+        * fontset.c (fontset_set): Fix previous change.
+
 2005-04-24  Richard M. Stallman  <rms@gnu.org>
 
         * indent.c (Fvertical_motion): Bind fontification-functions to nil.
diff --git a/src/fns.c b/src/fns.c
index b93ebb65234..f0dff278117 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -2508,50 +2508,143 @@ DEFUN ("set-char-table-extra-slot", Fset_char_table_extra_slot,
   return XCHAR_TABLE (char_table)->extras[XINT (n)] = value;
 }
 
+static Lisp_Object
+char_table_range (table, from, to, defalt)
+     Lisp_Object table;
+     int from, to;
+     Lisp_Object defalt;
+{
+  Lisp_Object val;
+
+  if (! NILP (XCHAR_TABLE (table)->defalt))
+    defalt = XCHAR_TABLE (table)->defalt;
+  val = XCHAR_TABLE (table)->contents[from];
+  if (SUB_CHAR_TABLE_P (val))
+    val = char_table_range (val, 32, 127, defalt);
+  else if (NILP (val))
+    val = defalt;
+  for (from++; from <= to; from++)
+    {
+      Lisp_Object this_val;
+
+      this_val = XCHAR_TABLE (table)->contents[from];
+      if (SUB_CHAR_TABLE_P (this_val))
+        this_val = char_table_range (this_val, 32, 127, defalt);
+      else if (NILP (this_val))
+        this_val = defalt;
+      if (! EQ (val, this_val))
+        error ("Characters in the range have inconsistent values");
+    }
+  return val;
+}  
+
+
 DEFUN ("char-table-range", Fchar_table_range, Schar_table_range,
        2, 2, 0,
        doc: /* Return the value in CHAR-TABLE for a range of characters RANGE.
 RANGE should be nil (for the default value)
 a vector which identifies a character set or a row of a character set,
-a character set name, or a character code.  */)
+a character set name, or a character code.
+If the characters in the specified range have different values,
+an error is signalled.
+
+Note that this function doesn't check the parent of CHAR_TABLE.  */)
      (char_table, range)
      Lisp_Object char_table, range;
 {
+  int charset_id, c1 = 0, c2 = 0;
+  int size, i;
+  Lisp_Object ch, val, current_default;
+
   CHECK_CHAR_TABLE (char_table);
 
   if (EQ (range, Qnil))
     return XCHAR_TABLE (char_table)->defalt;
-  else if (INTEGERP (range))
-    return Faref (char_table, range);
+  if (INTEGERP (range))
+    {
+      int c = XINT (range);
+      if (! CHAR_VALID_P (c, 0))
+        error ("Invalid character code: %d", c);
+      ch = range;
+      SPLIT_CHAR (c, charset_id, c1, c2);
+    }
   else if (SYMBOLP (range))
     {
       Lisp_Object charset_info;
 
       charset_info = Fget (range, Qcharset);
       CHECK_VECTOR (charset_info);
-
-      return Faref (char_table,
-                    make_number (XINT (XVECTOR (charset_info)->contents[0])
-                                 + 128));
+      charset_id = XINT (XVECTOR (charset_info)->contents[0]);
+      ch = Fmake_char_internal (make_number (charset_id),
+                                make_number (0), make_number (0));
     }
   else if (VECTORP (range))
     {
-      if (XVECTOR (range)->size == 1)
-        return Faref (char_table,
-                      make_number (XINT (XVECTOR (range)->contents[0]) + 128));
-      else
+      size = ASIZE (range);
+      if (size == 0)
+        args_out_of_range (range, 0);
+      CHECK_NUMBER (AREF (range, 0));
+      charset_id = XINT (AREF (range, 0));
+      if (size > 1)
         {
-          int size = XVECTOR (range)->size;
-          Lisp_Object *val = XVECTOR (range)->contents;
-          Lisp_Object ch = Fmake_char_internal (size <= 0 ? Qnil : val[0],
-                                                size <= 1 ? Qnil : val[1],
-                                                size <= 2 ? Qnil : val[2]);
-          return Faref (char_table, ch);
+          CHECK_NUMBER (AREF (range, 1));
+          c1 = XINT (AREF (range, 1));
+          if (size > 2)
+            {
+              CHECK_NUMBER (AREF (range, 2));
+              c2 = XINT (AREF (range, 2));
+            }
         }
+
+      /* This checks if charset_id, c0, and c1 are all valid or not.  */
+      ch = Fmake_char_internal (make_number (charset_id),
+                                make_number (c1), make_number (c2));
     }
   else
     error ("Invalid RANGE argument to `char-table-range'");
-  return Qt;
+
+  if (c1 > 0 && (CHARSET_DIMENSION (charset_id) == 1 || c2 > 0))
+    {
+      /* Fully specified character.  */
+      Lisp_Object parent = XCHAR_TABLE (char_table)->parent;
+
+      XCHAR_TABLE (char_table)->parent = Qnil;
+      val = Faref (char_table, ch);
+      XCHAR_TABLE (char_table)->parent = parent;
+      return val;
+    }
+
+  current_default = XCHAR_TABLE (char_table)->defalt;
+  if (charset_id == CHARSET_ASCII
+      || charset_id == CHARSET_8_BIT_CONTROL
+      || charset_id == CHARSET_8_BIT_GRAPHIC)
+    {
+      int from, to, defalt;
+
+      if (charset_id == CHARSET_ASCII)
+        from = 0, to = 127, defalt = CHAR_TABLE_DEFAULT_SLOT_ASCII;
+      else if (charset_id == CHARSET_8_BIT_CONTROL)
+        from = 128, to = 159, defalt = CHAR_TABLE_DEFAULT_SLOT_8_BIT_CONTROL;
+      else
+        from = 160, to = 255, defalt = CHAR_TABLE_DEFAULT_SLOT_8_BIT_GRAPHIC;
+      if (! NILP (XCHAR_TABLE (char_table)->contents[defalt]))
+        current_default = XCHAR_TABLE (char_table)->contents[defalt];
+      return char_table_range (char_table, from, to, current_default);
+    }
+  
+  val = XCHAR_TABLE (char_table)->contents[128 + charset_id];
+  if (! SUB_CHAR_TABLE_P (val))
+    return (NILP (val) ? current_default : val);
+  if (! NILP (XCHAR_TABLE (val)->defalt))
+    current_default = XCHAR_TABLE (val)->defalt;
+  if (c1 == 0)
+    return char_table_range (val, 32, 127, current_default);
+  val = XCHAR_TABLE (val)->contents[c1];
+  if (! SUB_CHAR_TABLE_P (val))
+    return (NILP (val) ? current_default : val);
+  if (! NILP (XCHAR_TABLE (val)->defalt))
+    current_default = XCHAR_TABLE (val)->defalt;
+  return char_table_range (val, 32, 127, current_default);
 }
 
 DEFUN ("set-char-table-range", Fset_char_table_range, Sset_char_table_range,
diff --git a/src/fontset.c b/src/fontset.c
index ee6ef213af7..8d4507530fa 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -356,7 +356,7 @@ fontset_set (fontset, c, newelt)
       if (!SUB_CHAR_TABLE_P (*elt))
         {
           Lisp_Object val = *elt;
-          *elt = make_sub_char_table (val);
+          *elt = make_sub_char_table (Qnil);
           XCHAR_TABLE (*elt)->defalt = val;
         }
       elt = &XCHAR_TABLE (*elt)->contents[code[i]];