Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-927

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 @@
+2007-11-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * xdisp.c (load_overlay_strings): Fix copy&paste typo.
+
 2007-11-09  Jason Rumney  <jasonr@gnu.org>
 
         * 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)
   j = it->current.overlay_string_index;
   while (i < OVERLAY_STRING_CHUNK_SIZE && j < n)
     {
-      it->overlay_strings[i++] = entries[j++].string;
+      it->overlay_strings[i] = entries[j].string;
       it->string_overlays[i++] = entries[j++].overlay;
     }