# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1290021324 -7200
# Node ID b59fc34f97fbff4d805963fd8a7c8807361e6be5
# Parent  24619421a8ddd8cf88fcbab47a1fbda1709c2332
Fix bug #7417 with cursor positioning on empty lines.

 xdisp.c (set_cursor_from_row): Fix cursor positioning in empty
 lines on text-mode terminals.

diff -r 24619421a8dd -r b59fc34f97fb src/ChangeLog
--- a/src/ChangeLog	Wed Nov 17 10:12:02 2010 -0500
+++ b/src/ChangeLog	Wed Nov 17 21:15:24 2010 +0200
@@ -1,3 +1,8 @@
+2010-11-17  Eli Zaretskii  <eliz@gnu.org>
+
+	* xdisp.c (set_cursor_from_row): Fix cursor positioning in empty
+	lines on text-mode terminals.  (bug#7417)
+
 2010-11-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* xterm.c (get_current_wm_state): Rename from get_current_vm_state.
diff -r 24619421a8dd -r b59fc34f97fb src/xdisp.c
--- a/src/xdisp.c	Wed Nov 17 10:12:02 2010 -0500
+++ b/src/xdisp.c	Wed Nov 17 21:15:24 2010 +0200
@@ -12839,6 +12839,15 @@
 	&& BUFFERP (glyph->object) && glyph->charpos == pt_old)
       && bpos_covered < pt_old)
     {
+      /* An empty line has a single glyph whose OBJECT is zero and
+	 whose CHARPOS is the position of a newline on that line.
+	 Note that on a TTY, there are more glyphs after that, which
+	 were produced by extend_face_to_end_of_line, but their
+	 CHARPOS is zero or negative.  */
+      int empty_line_p =
+	(row->reversed_p ? glyph > glyphs_end : glyph < glyphs_end)
+	&& INTEGERP (glyph->object) && glyph->charpos > 0;
+
       if (row->ends_in_ellipsis_p && pos_after == last_pos)
 	{
 	  EMACS_INT ellipsis_pos;
@@ -12875,6 +12884,7 @@
 	       || (row->truncated_on_right_p && pt_old > bpos_max)
 	       /* Zero-width characters produce no glyphs.  */
 	       || (!string_seen
+		   && !empty_line_p
 		   && (row->reversed_p
 		       ? glyph_after > glyphs_end
 		       : glyph_after < glyphs_end)))