[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/editfns.c
From: |
Kim F . Storm |
Subject: |
[Emacs-diffs] Changes to emacs/src/editfns.c |
Date: |
Tue, 26 Oct 2004 18:46:35 -0400 |
Index: emacs/src/editfns.c
diff -c emacs/src/editfns.c:1.380 emacs/src/editfns.c:1.381
*** emacs/src/editfns.c:1.380 Fri Oct 22 13:09:39 2004
--- emacs/src/editfns.c Tue Oct 26 22:37:34 2004
***************
*** 2775,2781 ****
pos = XINT (start);
pos_byte = CHAR_TO_BYTE (pos);
! end_pos = XINT (end);
modify_region (current_buffer, pos, XINT (end));
cnt = 0;
--- 2775,2781 ----
pos = XINT (start);
pos_byte = CHAR_TO_BYTE (pos);
! end_pos = XINT (end);
modify_region (current_buffer, pos, XINT (end));
cnt = 0;
***************
*** 3268,3274 ****
/* 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,
--- 3268,3274 ----
/* 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,
***************
*** 3319,3329 ****
{
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]));
}
--- 3319,3331 ----
{
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]));
}
***************
*** 3684,3690 ****
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
--- 3686,3692 ----
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
***************
*** 4056,4062 ****
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. */
--- 4058,4064 ----
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. */
***************
*** 4069,4075 ****
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);
--- 4071,4077 ----
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);
***************
*** 4105,4111 ****
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);
--- 4107,4113 ----
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);
***************
*** 4134,4140 ****
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);
--- 4136,4142 ----
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);
***************
*** 4165,4171 ****
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);
--- 4167,4173 ----
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);