aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-04-18 17:42:41 -0700
committerPaul Eggert2011-04-18 17:42:41 -0700
commit3c616cfa1341ea3dd54dd8b1927213e5e21aa322 (patch)
tree6ed4640c4936e65214d40f87ef9b354b674d8316 /src
parentc2982e87d382f0b5c00a65e63716c2b43d342881 (diff)
downloademacs-3c616cfa1341ea3dd54dd8b1927213e5e21aa322.tar.gz
emacs-3c616cfa1341ea3dd54dd8b1927213e5e21aa322.zip
* alloc.c (compact_small_strings): Tighten assertion a little.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/alloc.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 9aff9fbbc53..4af83e1d973 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12011-04-19 Paul Eggert <eggert@cs.ucla.edu> 12011-04-19 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * alloc.c (compact_small_strings): Tighten assertion a little.
4
3 Replace pEd with more-general pI, and fix some printf arg casts. 5 Replace pEd with more-general pI, and fix some printf arg casts.
4 * lisp.h (pI): New macro, generalizing old pEd macro to other 6 * lisp.h (pI): New macro, generalizing old pEd macro to other
5 conversion specifiers. For example, use "...%"pI"d..." rather 7 conversion specifiers. For example, use "...%"pI"d..." rather
diff --git a/src/alloc.c b/src/alloc.c
index 423c1f167db..82be8a903b4 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -2140,7 +2140,7 @@ compact_small_strings (void)
2140 /* Copy, and update the string's `data' pointer. */ 2140 /* Copy, and update the string's `data' pointer. */
2141 if (from != to) 2141 if (from != to)
2142 { 2142 {
2143 xassert (tb != b || to <= from); 2143 xassert (tb != b || to < from);
2144 memmove (to, from, nbytes + GC_STRING_EXTRA); 2144 memmove (to, from, nbytes + GC_STRING_EXTRA);
2145 to->string->data = SDATA_DATA (to); 2145 to->string->data = SDATA_DATA (to);
2146 } 2146 }