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

[Miles Bader]

Index: emacs/src/editfns.c
diff -c emacs/src/editfns.c:1.330.2.14 emacs/src/editfns.c:1.330.2.15
*** emacs/src/editfns.c:1.330.2.14      Thu Sep 16 00:15:00 2004
--- emacs/src/editfns.c Mon Oct 25 04:22:26 2004
***************
*** 2736,2743 ****
    return Qnil;
  }
  
! DEFUN ("translate-region", Ftranslate_region, Stranslate_region, 3, 3, 0,
!        doc: /* From START to END, translate characters according to TABLE.
  TABLE is a string; the Nth character in it is the mapping
  for the character with code N.
  It returns the number of characters changed.  */)
--- 2736,2745 ----
    return Qnil;
  }
  
! DEFUN ("translate-region-internal", Ftranslate_region_internal,
!        Stranslate_region_internal, 3, 3, 0,
!        doc: /* Internal use only.
! From START to END, translate characters according to TABLE.
  TABLE is a string; the Nth character in it is the mapping
  for the character with code N.
  It returns the number of characters changed.  */)
***************
*** 2750,2780 ****
    register int nc;            /* New character. */
    int cnt;                    /* Number of changes made. */
    int size;                   /* Size of translate table. */
!   int pos, pos_byte;
    int multibyte = !NILP (current_buffer->enable_multibyte_characters);
    int string_multibyte;
  
    validate_region (&start, &end);
!   CHECK_STRING (table);
! 
!   if (multibyte != (SCHARS (table) < SBYTES (table)))
!     table = (multibyte
!            ? string_make_multibyte (table)
!            : string_make_unibyte (table));
!   string_multibyte = SCHARS (table) < SBYTES (table);
  
!   size = SCHARS (table);
!   tt = SDATA (table);
  
    pos = XINT (start);
    pos_byte = CHAR_TO_BYTE (pos);
    modify_region (current_buffer, pos, XINT (end));
  
    cnt = 0;
!   for (; pos < XINT (end); )
      {
        register unsigned char *p = BYTE_POS_ADDR (pos_byte);
!       unsigned char *str;
        int len, str_len;
        int oc;
  
--- 2752,2788 ----
    register int nc;            /* New character. */
    int cnt;                    /* Number of changes made. */
    int size;                   /* Size of translate table. */
!   int pos, pos_byte, end_pos;
    int multibyte = !NILP (current_buffer->enable_multibyte_characters);
    int string_multibyte;
  
    validate_region (&start, &end);
!   if (CHAR_TABLE_P (table))
!     {
!       size = MAX_CHAR;
!       tt = NULL;
!     }
!   else
!     {
!       CHECK_STRING (table);
  
!       if (! multibyte && (SCHARS (table) < SBYTES (table)))
!       table = string_make_unibyte (table);
!       string_multibyte = SCHARS (table) < SBYTES (table);
!       size = SCHARS (table);
!       tt = SDATA (table);
!     }
  
    pos = XINT (start);
    pos_byte = CHAR_TO_BYTE (pos);
+   end_pos = XINT (end); 
    modify_region (current_buffer, pos, XINT (end));
  
    cnt = 0;
!   for (; pos < end_pos; )
      {
        register unsigned char *p = BYTE_POS_ADDR (pos_byte);
!       unsigned char *str, buf[MAX_MULTIBYTE_LENGTH];
        int len, str_len;
        int oc;
  
***************
*** 2784,2799 ****
        oc = *p, len = 1;
        if (oc < size)
        {
!         if (string_multibyte)
            {
!             str = tt + string_char_to_byte (table, oc);
!             nc = STRING_CHAR_AND_LENGTH (str, MAX_MULTIBYTE_LENGTH, str_len);
            }
          else
            {
!             str = tt + oc;
!             nc = tt[oc], str_len = 1;
            }
          if (nc != oc)
            {
              if (len != str_len)
--- 2792,2836 ----
        oc = *p, len = 1;
        if (oc < size)
        {
!         if (tt)
            {
!             if (string_multibyte)
!               {
!                 str = tt + string_char_to_byte (table, oc);
!                 nc = STRING_CHAR_AND_LENGTH (str, MAX_MULTIBYTE_LENGTH,
!                                              str_len);
!               }
!             else
!               {
!                 nc = tt[oc];
!                 if (! ASCII_BYTE_P (nc) && multibyte)
!                   {
!                     str_len = CHAR_STRING (nc, buf);
!                     str = buf;
!                   }
!                 else
!                   {
!                     str_len = 1;
!                     str = tt + oc;
!                   }
!               }
            }
          else
            {
!             Lisp_Object val;
!             int c;
! 
!             nc = oc;
!             val = CHAR_TABLE_REF (table, oc);
!             if (INTEGERP (val)
!                 && (c = XINT (val), CHAR_VALID_P (c, 0)))
!               {
!                 nc = c;
!                 str_len = CHAR_STRING (nc, buf);
!                 str = buf;
!               }
            }
+ 
          if (nc != oc)
            {
              if (len != str_len)
***************
*** 2844,2849 ****
--- 2881,2888 ----
       Lisp_Object start, end;
  {
    validate_region (&start, &end);
+   if (XINT (start) == XINT (end))
+     return build_string ("");
    return del_range_1 (XINT (start), XINT (end), 1, 1);
  }
  
***************
*** 4288,4294 ****
    defsubr (&Sinsert_buffer_substring);
    defsubr (&Scompare_buffer_substrings);
    defsubr (&Ssubst_char_in_region);
!   defsubr (&Stranslate_region);
    defsubr (&Sdelete_region);
    defsubr (&Sdelete_and_extract_region);
    defsubr (&Swiden);
--- 4327,4333 ----
    defsubr (&Sinsert_buffer_substring);
    defsubr (&Scompare_buffer_substrings);
    defsubr (&Ssubst_char_in_region);
!   defsubr (&Stranslate_region_internal);
    defsubr (&Sdelete_region);
    defsubr (&Sdelete_and_extract_region);
    defsubr (&Swiden);