* xdisp.c (note_mode_line_or_margin_highlight): Call clear_mouse_face

when mouse_face is not given.
Remove unnecessary tabs.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2622787d3aa501a07ca99ea3fd760beb31c94365..94479694c7a94de0ddc42024b7d3780c93d91b73 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-10  Masatake YAMATO  <jet@gyve.org>
+
+       * 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  <teirllm@auburn.edu>
 
        * window.c (Fselect_window): Adapt call to Fselect_frame.

diff --git a/src/xdisp.c b/src/xdisp.c
index 3a44cc808c027148cd57d3c6f5dc0af22f53c4db..b32f43b97b9df8c125a95700361a91efec43c405 100644 (file)
--- 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);
 }