Mercurial > emacs
changeset 63190:ff6c8b50eefd
* xdisp.c (note_mode_line_or_margin_highlight): Call clear_mouse_face
when mouse_face is not given.
Remove unnecessary tabs.
| author | Masatake YAMATO <jet@gyve.org> |
|---|---|
| date | Fri, 10 Jun 2005 05:31:45 +0000 |
| parents | cf4a5258f723 |
| children | d9becfcb69a7 |
| files | src/ChangeLog src/xdisp.c |
| diffstat | 2 files changed, 13 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Jun 10 02:45:38 2005 +0000 +++ b/src/ChangeLog Fri Jun 10 05:31:45 2005 +0000 @@ -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.
--- a/src/xdisp.c Fri Jun 10 02:45:38 2005 +0000 +++ b/src/xdisp.c Fri Jun 10 05:31:45 2005 +0000 @@ -21523,7 +21523,7 @@ 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 @@ 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 @@ && 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 @@ 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); }