procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(get_window_cursor_type): Don't look at glyph if NULL.

Browse source 
(display_and_set_cursor): Set glyph to NULL if cursor in fringe.
This commit is contained in:
Kim F. Storm 2004-02-17 21:36:00 +00:00
parent b26f249f3e
commit 5c7528cd68
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/xdisp.c
View file

@ -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. */