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

[Miles Bader]

Index: emacs/src/editfns.c
diff -c emacs/src/editfns.c:1.359.2.12 emacs/src/editfns.c:1.359.2.13
*** emacs/src/editfns.c:1.359.2.12      Fri Oct 22 10:13:35 2004
--- emacs/src/editfns.c Wed Oct 27 06:03:07 2004
***************
*** 2858,2864 ****
  
    pos = XINT (start);
    pos_byte = CHAR_TO_BYTE (pos);
!   end_pos = XINT (end); 
    modify_region (current_buffer, pos, end_pos);
  
    cnt = 0;
--- 2858,2864 ----
  
    pos = XINT (start);
    pos_byte = CHAR_TO_BYTE (pos);
!   end_pos = XINT (end);
    modify_region (current_buffer, pos, end_pos);
  
    cnt = 0;
***************
*** 3387,3393 ****
    /* discarded[I] is 1 if byte I of the format
       string was not copied into the output.
       It is 2 if byte I was not the first byte of its character.  */
!   char *discarded;
  
    /* Each element records, for one argument,
       the start and end bytepos in the output string,
--- 3387,3393 ----
    /* discarded[I] is 1 if byte I of the format
       string was not copied into the output.
       It is 2 if byte I was not the first byte of its character.  */
!   char *discarded = 0;
  
    /* Each element records, for one argument,
       the start and end bytepos in the output string,
***************
*** 3438,3448 ****
    {
      int nbytes = (nargs+1) * sizeof *info;
      int i;
!     info = (struct info *) alloca (nbytes);
      bzero (info, nbytes);
      for (i = 0; i <= nargs; i++)
        info[i].start = -1;
!     discarded = (char *) alloca (SBYTES (args[0]));
      bzero (discarded, SBYTES (args[0]));
    }
  
--- 3438,3450 ----
    {
      int nbytes = (nargs+1) * sizeof *info;
      int i;
!     if (!info)
!       info = (struct info *) alloca (nbytes);
      bzero (info, nbytes);
      for (i = 0; i <= nargs; i++)
        info[i].start = -1;
!     if (!discarded)
!       SAFE_ALLOCA (discarded, char *, SBYTES (args[0]));
      bzero (discarded, SBYTES (args[0]));
    }
  
***************
*** 3803,3809 ****
    val = make_specified_string (buf, nchars, p - buf, multibyte);
  
    /* If we allocated BUF with malloc, free it too.  */
!   SAFE_FREE (total);
  
    /* If the format string has text properties, or any of the string
       arguments has text properties, set up text properties of the
--- 3805,3811 ----
    val = make_specified_string (buf, nchars, p - buf, multibyte);
  
    /* If we allocated BUF with malloc, free it too.  */
!   SAFE_FREE ();
  
    /* If the format string has text properties, or any of the string
       arguments has text properties, set up text properties of the
***************
*** 4187,4193 ****
            bcopy (start2_addr, temp, len2_byte);
            bcopy (start1_addr, start1_addr + len2_byte, len1_byte);
            bcopy (temp, start1_addr, len2_byte);
!         SAFE_FREE (len2_byte);
          }
        else
        /* First region not smaller than second.  */
--- 4189,4195 ----
            bcopy (start2_addr, temp, len2_byte);
            bcopy (start1_addr, start1_addr + len2_byte, len1_byte);
            bcopy (temp, start1_addr, len2_byte);
!         SAFE_FREE ();
          }
        else
        /* First region not smaller than second.  */
***************
*** 4200,4206 ****
            bcopy (start1_addr, temp, len1_byte);
            bcopy (start2_addr, start1_addr, len2_byte);
            bcopy (temp, start1_addr + len2_byte, len1_byte);
!         SAFE_FREE (len1_byte);
          }
        graft_intervals_into_buffer (tmp_interval1, start1 + len2,
                                     len1, current_buffer, 0);
--- 4202,4208 ----
            bcopy (start1_addr, temp, len1_byte);
            bcopy (start2_addr, start1_addr, len2_byte);
            bcopy (temp, start1_addr + len2_byte, len1_byte);
!         SAFE_FREE ();
          }
        graft_intervals_into_buffer (tmp_interval1, start1 + len2,
                                     len1, current_buffer, 0);
***************
*** 4236,4242 ****
            bcopy (start1_addr, temp, len1_byte);
            bcopy (start2_addr, start1_addr, len2_byte);
            bcopy (temp, start2_addr, len1_byte);
!         SAFE_FREE (len1_byte);
  
            graft_intervals_into_buffer (tmp_interval1, start2,
                                         len1, current_buffer, 0);
--- 4238,4244 ----
            bcopy (start1_addr, temp, len1_byte);
            bcopy (start2_addr, start1_addr, len2_byte);
            bcopy (temp, start2_addr, len1_byte);
!         SAFE_FREE ();
  
            graft_intervals_into_buffer (tmp_interval1, start2,
                                         len1, current_buffer, 0);
***************
*** 4265,4271 ****
            bcopy (start1_addr, start1_addr + len_mid + len2_byte, len1_byte);
            safe_bcopy (start1_addr + len1_byte, start1_addr + len2_byte, 
len_mid);
            bcopy (temp, start1_addr, len2_byte);
!         SAFE_FREE (len2_byte);
  
            graft_intervals_into_buffer (tmp_interval1, end2 - len1,
                                         len1, current_buffer, 0);
--- 4267,4273 ----
            bcopy (start1_addr, start1_addr + len_mid + len2_byte, len1_byte);
            safe_bcopy (start1_addr + len1_byte, start1_addr + len2_byte, 
len_mid);
            bcopy (temp, start1_addr, len2_byte);
!         SAFE_FREE ();
  
            graft_intervals_into_buffer (tmp_interval1, end2 - len1,
                                         len1, current_buffer, 0);
***************
*** 4296,4302 ****
            bcopy (start2_addr, start1_addr, len2_byte);
            bcopy (start1_addr + len1_byte, start1_addr + len2_byte, len_mid);
            bcopy (temp, start1_addr + len2_byte + len_mid, len1_byte);
!         SAFE_FREE (len1_byte);
  
            graft_intervals_into_buffer (tmp_interval1, end2 - len1,
                                         len1, current_buffer, 0);
--- 4298,4304 ----
            bcopy (start2_addr, start1_addr, len2_byte);
            bcopy (start1_addr + len1_byte, start1_addr + len2_byte, len_mid);
            bcopy (temp, start1_addr + len2_byte + len_mid, len1_byte);
!         SAFE_FREE ();
  
            graft_intervals_into_buffer (tmp_interval1, end2 - len1,
                                         len1, current_buffer, 0);