From 5c7528cd68f7fa20808782690f85c98ed185e86e Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Tue, 17 Feb 2004 21:36:00 +0000 Subject: [PATCH] (get_window_cursor_type): Don't look at glyph if NULL. (display_and_set_cursor): Set glyph to NULL if cursor in fringe. --- src/xdisp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/xdisp.c b/src/xdisp.c index 93a90dafdfe..0967041f3b6 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -19029,7 +19029,7 @@ get_window_cursor_type (w, glyph, width, active_cursor) 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 @@ display_and_set_cursor (w, on, hpos, vpos, x, y) 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. */ -- 2.39.2