[Emacs-diffs] Changes to emacs/src/fns.c

[Kenichi Handa]

Index: emacs/src/fns.c
diff -c emacs/src/fns.c:1.386 emacs/src/fns.c:1.387
*** emacs/src/fns.c:1.386       Tue Apr 19 08:34:19 2005
--- emacs/src/fns.c     Wed Apr 20 07:50:43 2005
***************
*** 2578,2584 ****
  
    if (EQ (range, Qt))
      for (i = 0; i < CHAR_TABLE_ORDINARY_SLOTS; i++)
!       XCHAR_TABLE (char_table)->contents[i] = value;
    else if (EQ (range, Qnil))
      XCHAR_TABLE (char_table)->defalt = value;
    else if (SYMBOLP (range))
--- 2578,2591 ----
  
    if (EQ (range, Qt))
      for (i = 0; i < CHAR_TABLE_ORDINARY_SLOTS; i++)
!       {
!       /* Don't set these special slots used for default values of
!          ascii, eight-bit-control, and eight-bit-graphic.  */
!       if (i != CHAR_TABLE_DEFAULT_SLOT_ASCII
!           && i != CHAR_TABLE_DEFAULT_SLOT_8_BIT_CONTROL
!           && i != CHAR_TABLE_DEFAULT_SLOT_8_BIT_GRAPHIC)
!         XCHAR_TABLE (char_table)->contents[i] = value;
!       }
    else if (EQ (range, Qnil))
      XCHAR_TABLE (char_table)->defalt = value;
    else if (SYMBOLP (range))
***************
*** 2609,2627 ****
      Faset (char_table, range, value);
    else if (VECTORP (range))
      {
!       if (XVECTOR (range)->size == 1)
!       return Faset (char_table,
!                     make_number (XINT (XVECTOR (range)->contents[0]) + 128),
!                     value);
!       else
!       {
!         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 Faset (char_table, ch, value);
!       }
      }
    else
      error ("Invalid RANGE argument to `set-char-table-range'");
--- 2616,2627 ----
      Faset (char_table, range, value);
    else if (VECTORP (range))
      {
!       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]);
!       Faset (char_table, ch, value);
      }
    else
      error ("Invalid RANGE argument to `set-char-table-range'");
***************
*** 2633,2638 ****
--- 2633,2640 ----
         Sset_char_table_default, 3, 3, 0,
         doc: /* Set the default value in CHAR-TABLE for generic character CH 
to VALUE.
  The generic character specifies the group of characters.
+ If CH is a normal character, set the default value for a group of
+ characters to which CH belongs.
  See also the documentation of `make-char'.  */)
       (char_table, ch, value)
       Lisp_Object char_table, ch, value;
***************
*** 2652,2678 ****
    if (! CHARSET_VALID_P (charset))
      invalid_character (c);
  
!   if (charset == CHARSET_ASCII)
!     return (XCHAR_TABLE (char_table)->defalt = value);
  
    /* Even if C is not a generic char, we had better behave as if a
       generic char is specified.  */
    if (!CHARSET_DEFINED_P (charset) || CHARSET_DIMENSION (charset) == 1)
      code1 = 0;
    temp = XCHAR_TABLE (char_table)->contents[charset + 128];
    if (!code1)
      {
!       if (SUB_CHAR_TABLE_P (temp))
!       XCHAR_TABLE (temp)->defalt = value;
!       else
!       XCHAR_TABLE (char_table)->contents[charset + 128] = value;
        return value;
      }
!   if (SUB_CHAR_TABLE_P (temp))
!     char_table = temp;
!   else
!     char_table = (XCHAR_TABLE (char_table)->contents[charset + 128]
!                 = make_sub_char_table (temp));
    temp = XCHAR_TABLE (char_table)->contents[code1];
    if (SUB_CHAR_TABLE_P (temp))
      XCHAR_TABLE (temp)->defalt = value;
--- 2654,2687 ----
    if (! CHARSET_VALID_P (charset))
      invalid_character (c);
  
!   if (SINGLE_BYTE_CHAR_P (c))
!     {
!       /* We use special slots for the default values of single byte
!        characters.  */
!       int default_slot
!       = (c < 0x80 ? CHAR_TABLE_DEFAULT_SLOT_ASCII
!          : c < 0xA0 ? CHAR_TABLE_DEFAULT_SLOT_8_BIT_CONTROL
!          : CHAR_TABLE_DEFAULT_SLOT_8_BIT_GRAPHIC);
! 
!       return (XCHAR_TABLE (char_table)->contents[default_slot] = value);
!     }
  
    /* Even if C is not a generic char, we had better behave as if a
       generic char is specified.  */
    if (!CHARSET_DEFINED_P (charset) || CHARSET_DIMENSION (charset) == 1)
      code1 = 0;
    temp = XCHAR_TABLE (char_table)->contents[charset + 128];
+   if (! SUB_CHAR_TABLE_P (temp))
+     {
+       temp = make_sub_char_table (temp);
+       XCHAR_TABLE (char_table)->contents[charset + 128] = temp;
+     }
    if (!code1)
      {
!       XCHAR_TABLE (temp)->defalt = value;
        return value;
      }
!   char_table = temp;
    temp = XCHAR_TABLE (char_table)->contents[code1];
    if (SUB_CHAR_TABLE_P (temp))
      XCHAR_TABLE (temp)->defalt = value;