1 files changed, 17 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 78ee4596e9b..3a4f08e00cc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,20 @@
+2008-06-30  Miles Bader  <Miles Bader <miles@gnu.org>>
+
+        * dispextern.h (struct glyph, struct it, struct iterator_stack_entry):
+        Add `avoid_cursor_p' field.
+
+        * xdisp.c (push_it, pop_it): Save/restore avoid_cursor_p field.
+        (set_cursor_from_row): Skip glyphs with avoid_cursor_p set.
+        (append_glyph, append_composite_glyph, produce_image_glyph)
+        (append_stretch_glyph): Initialize avoid_cursor_p
+        (get_it_property): Renamed from `get_line_height_property'.
+        (x_produce_glyphs): Use get_it_property.
+        (handle_line_prefix, push_display_prop): New functions.
+        (display_line, move_it_in_display_line_to): Handle line/wrap prefixes.
+        (Vwrap_prefix, Qwrap_prefix, Vline_prefix, Qline_prefix): New
+        variables.
+        (syms_of_xdisp): Initialize them.
+
 2008-06-30  Kenichi Handa  <handa@m17n.org>
 
         * xftfont.c (xftfont_open): Don't call FcConfigSubstitute and