# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1104543408 0
# Node ID 91f840a1067b063b591f2c7294ffb5eaca1e00be
# Parent  2d8a6be1520d17b0a436f7eff27843a1d11190d9
*** empty log message ***

diff -r 2d8a6be1520d -r 91f840a1067b src/ChangeLog
--- a/src/ChangeLog	Sat Jan 01 01:34:39 2005 +0000
+++ b/src/ChangeLog	Sat Jan 01 01:36:48 2005 +0000
@@ -4,6 +4,19 @@
 
 2004-12-31  Richard M. Stallman  <rms@gnu.org>
 
+	* xdisp.c (setup_for_ellipsis, get_next_display_element):
+	Set it->ellipsis_p to 1 or 0.
+	(display_line): Record whether row ends in mid-ellipsis.
+	(set_cursor_from_row): If ends in ellipsis. find start of it.
+	(cursor_row_p): If PT's at the end of the ellipsis the row
+	ends within, don't display cursor on this row.
+
+	* dispextern.h (struct it): New element ellipsis_p.
+	(struct glyph_row): New element ends_in_ellipsis_p.
+
+	* xdisp.c (BUFFER_POS_REACHED_P): We haven't reached the specified
+	position if we're reading from something other than the buffer.
+
 	* window.c (window_scroll_pixel_based): Only look at
 	Vscroll_preserve_screen_position if the old PT can't be kept.
 	(syms_of_window) <scroll-preserve-screen-position>: Doc fix.