mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-25 14:01:33 -08:00
Code Issues Projects Releases Wiki Activity

* xdisp.c (note_mode_line_or_margin_highlight): Call clear_mouse_face

Browse source 
when mouse_face is not given.
Remove unnecessary tabs.
This commit is contained in:
Masatake YAMATO 2005-06-10 05:31:45 +00:00
parent 6ecf436de1
commit 121c59a3e4
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

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

11
src/xdisp.c
View file

@ -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);
}