aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xdisp.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 9cf85ff8929..4cf00fc3c30 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12007-11-10 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * xdisp.c (load_overlay_strings): Fix copy&paste typo.
4
12007-11-09 Jason Rumney <jasonr@gnu.org> 52007-11-09 Jason Rumney <jasonr@gnu.org>
2 6
3 * s/ms-w32.c (USE_TOOLKIT_SCROLL_BARS): Define. 7 * s/ms-w32.c (USE_TOOLKIT_SCROLL_BARS): Define.
diff --git a/src/xdisp.c b/src/xdisp.c
index ed8d54cfaef..eb0fda1fa91 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -4906,7 +4906,7 @@ load_overlay_strings (it, charpos)
4906 j = it->current.overlay_string_index; 4906 j = it->current.overlay_string_index;
4907 while (i < OVERLAY_STRING_CHUNK_SIZE && j < n) 4907 while (i < OVERLAY_STRING_CHUNK_SIZE && j < n)
4908 { 4908 {
4909 it->overlay_strings[i++] = entries[j++].string; 4909 it->overlay_strings[i] = entries[j].string;
4910 it->string_overlays[i++] = entries[j++].overlay; 4910 it->string_overlays[i++] = entries[j++].overlay;
4911 } 4911 }
4912 4912