From 121c59a3e42a0d596967bf3e4baa323ea9bd4ff2 Mon Sep 17 00:00:00 2001 From: Masatake YAMATO Date: Fri, 10 Jun 2005 05:31:45 +0000 Subject: [PATCH] * xdisp.c (note_mode_line_or_margin_highlight): Call clear_mouse_face when mouse_face is not given. Remove unnecessary tabs. --- src/ChangeLog | 6 ++++++ src/xdisp.c | 11 ++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 2622787d3aa..94479694c7a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2005-06-10 Masatake YAMATO + + * xdisp.c (note_mode_line_or_margin_highlight): Call clear_mouse_face + when mouse_face is not given. + Remove unnecessary tabs. + 2005-06-09 Luc Teirlinck * window.c (Fselect_window): Adapt call to Fselect_frame. diff --git a/src/xdisp.c b/src/xdisp.c index 3a44cc808c0..b32f43b97b9 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -21523,7 +21523,7 @@ note_mode_line_or_margin_highlight (window, x, y, area) int ignore; int vpos, hpos; - + b = Fprevious_single_property_change (make_number (charpos + 1), Qmouse_face, string, Qnil); if (NILP (b)) @@ -21571,7 +21571,7 @@ note_mode_line_or_margin_highlight (window, x, y, area) hpos = (area == ON_MODE_LINE ? (w->current_matrix)->nrows - 1 : 0); - + /* If the re-rendering position is included in the last re-rendering area, we should do nothing. */ if ( window == dpyinfo->mouse_face_window @@ -21579,10 +21579,10 @@ note_mode_line_or_margin_highlight (window, x, y, area) && vpos < dpyinfo->mouse_face_end_col && dpyinfo->mouse_face_beg_row == hpos ) return; - + if (clear_mouse_face (dpyinfo)) cursor = No_Cursor; - + dpyinfo->mouse_face_beg_col = vpos; dpyinfo->mouse_face_beg_row = hpos; @@ -21607,8 +21607,9 @@ note_mode_line_or_margin_highlight (window, x, y, area) if (NILP (pointer)) pointer = Qhand; } + else if ((area == ON_MODE_LINE) || (area == ON_HEADER_LINE)) + clear_mouse_face (dpyinfo); } - define_frame_cursor1 (f, cursor, pointer); } -- 2.39.5