diff options
| author | Karoly Lorentey | 2004-10-31 02:05:24 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2004-10-31 02:05:24 +0000 |
| commit | e0bc17abe6979d607e8de4684dddb96e53c60065 (patch) | |
| tree | b7cb7bc5df9f12138937fd958cdf4b9c2d19ee3a /src/data.c | |
| parent | f158167a84475d5fc41931531406821e6413afd7 (diff) | |
| parent | 707994d2626cf0f01c3ece4028d73835068d64dc (diff) | |
| download | emacs-e0bc17abe6979d607e8de4684dddb96e53c60065.tar.gz emacs-e0bc17abe6979d607e8de4684dddb96e53c60065.zip | |
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-639
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-640
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-641
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-642
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-643
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-644
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-645
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-646
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-647
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-648
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-649
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-650
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-651
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-652
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-59
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-60
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-61
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-62
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-63
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-263
Diffstat (limited to 'src/data.c')
| -rw-r--r-- | src/data.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/data.c b/src/data.c index 33b37376a49..92487f82ddb 100644 --- a/src/data.c +++ b/src/data.c | |||
| @@ -2165,7 +2165,7 @@ bool-vector. IDX starts at 0. */) | |||
| 2165 | p1 = SDATA (array) + idxval_byte; | 2165 | p1 = SDATA (array) + idxval_byte; |
| 2166 | bcopy (str + idxval_byte + prev_bytes, p1 + new_bytes, | 2166 | bcopy (str + idxval_byte + prev_bytes, p1 + new_bytes, |
| 2167 | nbytes - (idxval_byte + prev_bytes)); | 2167 | nbytes - (idxval_byte + prev_bytes)); |
| 2168 | SAFE_FREE (nbytes); | 2168 | SAFE_FREE (); |
| 2169 | clear_string_char_byte_cache (); | 2169 | clear_string_char_byte_cache (); |
| 2170 | } | 2170 | } |
| 2171 | while (new_bytes--) | 2171 | while (new_bytes--) |
| @@ -2206,7 +2206,7 @@ bool-vector. IDX starts at 0. */) | |||
| 2206 | *p1++ = *p0++; | 2206 | *p1++ = *p0++; |
| 2207 | bcopy (str + idxval_byte + prev_bytes, p1, | 2207 | bcopy (str + idxval_byte + prev_bytes, p1, |
| 2208 | nbytes - (idxval_byte + prev_bytes)); | 2208 | nbytes - (idxval_byte + prev_bytes)); |
| 2209 | SAFE_FREE (nbytes); | 2209 | SAFE_FREE (); |
| 2210 | clear_string_char_byte_cache (); | 2210 | clear_string_char_byte_cache (); |
| 2211 | } | 2211 | } |
| 2212 | } | 2212 | } |