From: Gerd Moellmann <gerd@gnu.org>
Date: Tue, 23 Apr 2002 15:44:46 +0000 (+0000)
Subject: (notice_overwritten_cursor): Handle the special case
X-Git-Tag: ttn-vms-21-2-B4~15458
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=516074a15e810d88c96500f0f99bf549f2b8ce73;p=emacs.git

(notice_overwritten_cursor): Handle the special case
of the cursor being in the first blank non-text line at the
end of a window.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 54ee39a2314..8a8b1ad7b3a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2002-04-23  Gerd Moellmann  <gerd@gnu.org>
 
+	* xterm.c (notice_overwritten_cursor): Handle the special case
+	of the cursor being in the first blank non-text line at the
+	end of a window.
+	
 	* xterm.c (x_draw_hollow_cursor, x_draw_bar_cursor)
 	(x_draw_phys_cursor_glyph): Set phys_cursor_width here.
 	(x_display_and_set_cursor): Don't set phys_cursor_width here, for
diff --git a/src/xterm.c b/src/xterm.c
index 9088d7a0e80..d0a521d6e3c 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -11243,9 +11243,14 @@ notice_overwritten_cursor (w, area, x0, x1, y0, y1)
 	     actually scrolling, so we don't come here.  When not
 	     scrolling, the rows above the old cursor row must have
 	     changed, and in this case these rows must have written
-	     over the cursor image.  Likewise if part of the cursor is
-	     below y1.  */
-	  if ((y0 >= cy0 && y0 < cy1) || (y1 >= cy0 && y1 < cy1))
+	     over the cursor image.
+
+	     Likewise if part of the cursor is below y1, with the
+	     exception of the cursor being in the first blank row at
+	     the buffer and window end because update_text_area
+	     doesn't draw that row.  */
+	  if (((y0 >= cy0 && y0 < cy1) || (y1 >= cy0 && y1 < cy1))
+	      && w->current_matrix->rows[w->phys_cursor.vpos].displays_text_p)
 	    w->phys_cursor_on_p = 0;
 	}
     }