diff options
| author | Stefan Monnier | 2007-11-10 03:06:45 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2007-11-10 03:06:45 +0000 |
| commit | 8383dac7992befba8da714a3f9519a34472291c8 (patch) | |
| tree | 04a772a294d93d0739d39d9f4044ce99fad134ea /src | |
| parent | 1e013b133685df245f4ee248d6f51bb2d2f36797 (diff) | |
| download | emacs-8383dac7992befba8da714a3f9519a34472291c8.tar.gz emacs-8383dac7992befba8da714a3f9519a34472291c8.zip | |
(load_overlay_strings): Fix copy&paste typo.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/xdisp.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 5849ac96f4e..cf524729749 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2007-11-10 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * xdisp.c (load_overlay_strings): Fix copy&paste typo. | ||
| 4 | |||
| 1 | 2007-11-07 Chong Yidong <cyd@stupidchicken.com> | 5 | 2007-11-07 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 6 | ||
| 3 | * dispextern.h (struct it): Don't define OVERLAY_STRING_CHUNK_SIZE | 7 | * dispextern.h (struct it): Don't define OVERLAY_STRING_CHUNK_SIZE |
| @@ -29,7 +33,7 @@ | |||
| 29 | Rearrange a few elements. | 33 | Rearrange a few elements. |
| 30 | (face_for_overlay_string): Decl renamed from | 34 | (face_for_overlay_string): Decl renamed from |
| 31 | face_at_buffer_position_no_overlays, and add argument. | 35 | face_at_buffer_position_no_overlays, and add argument. |
| 32 | 36 | ||
| 33 | 2007-11-03 Richard Stallman <rms@gnu.org> | 37 | 2007-11-03 Richard Stallman <rms@gnu.org> |
| 34 | 38 | ||
| 35 | * xdisp.c (handle_face_prop): Use face_at_buffer_position_no_overlays | 39 | * xdisp.c (handle_face_prop): Use face_at_buffer_position_no_overlays |
diff --git a/src/xdisp.c b/src/xdisp.c index 4c78f6ac8f8..9a5131a047b 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -4918,7 +4918,7 @@ load_overlay_strings (it, charpos) | |||
| 4918 | j = it->current.overlay_string_index; | 4918 | j = it->current.overlay_string_index; |
| 4919 | while (i < OVERLAY_STRING_CHUNK_SIZE && j < n) | 4919 | while (i < OVERLAY_STRING_CHUNK_SIZE && j < n) |
| 4920 | { | 4920 | { |
| 4921 | it->overlay_strings[i++] = entries[j++].string; | 4921 | it->overlay_strings[i] = entries[j].string; |
| 4922 | it->string_overlays[i++] = entries[j++].overlay; | 4922 | it->string_overlays[i++] = entries[j++].overlay; |
| 4923 | } | 4923 | } |
| 4924 | 4924 | ||