# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1077053760 0
# Node ID c09f1e11d806a5fb2152863aebbc8736dedcaaad
# Parent  10500fa1a2b10be5700e72970ab7f7e1bdcef9b2
(get_window_cursor_type): Don't look at glyph if NULL.
(display_and_set_cursor): Set glyph to NULL if cursor in fringe.

diff -r 10500fa1a2b1 -r c09f1e11d806 src/xdisp.c
--- a/src/xdisp.c	Tue Feb 17 21:35:30 2004 +0000
+++ b/src/xdisp.c	Tue Feb 17 21:36:00 2004 +0000
@@ -19029,7 +19029,7 @@
     cursor_type = get_specified_cursor_type (b->cursor_type, width);
 
   /* Use normal cursor if not blinked off.  */
-  if (!w->cursor_off_p)
+  if (!w->cursor_off_p && glyph != NULL)
     {
       if (glyph->type == IMAGE_GLYPH) {
 	if (cursor_type == FILLED_BOX_CURSOR)
@@ -19368,7 +19368,8 @@
 
   current_glyphs = w->current_matrix;
   glyph_row = MATRIX_ROW (current_glyphs, vpos);
-  glyph = glyph_row->glyphs[TEXT_AREA] + hpos;
+  glyph = (glyph_row->cursor_in_fringe_p ? NULL
+	   : glyph_row->glyphs[TEXT_AREA] + hpos);
 
   /* If cursor row is not enabled, we don't really know where to
      display the cursor.  */