Mercurial > emacs
comparison src/xdisp.c @ 86030:72cbf2612765
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-927
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sun, 11 Nov 2007 00:03:33 +0000 |
parents | d3e87ee5aa0e 329636cf01af |
children | ec0ef12211d9 880960b70474 |
comparison
equal
deleted
inserted
replaced
86029:22be0027622f | 86030:72cbf2612765 |
---|---|
4904 remaining overlay strings to IT->overlay_strings. */ | 4904 remaining overlay strings to IT->overlay_strings. */ |
4905 i = 0; | 4905 i = 0; |
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 |
4913 CHECK_IT (it); | 4913 CHECK_IT (it); |
4914 } | 4914 } |