aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Djärv2010-03-30 19:26:58 +0200
committerJan Djärv2010-03-30 19:26:58 +0200
commit67fee863be3a08eae00736fe0777bdb0c259cdff (patch)
tree0b218aefd5b6a0af81cf7666c0f5444ba9d004a4
parent660674c1e990ef5eae856bace2e63b0442c63aeb (diff)
downloademacs-67fee863be3a08eae00736fe0777bdb0c259cdff.tar.gz
emacs-67fee863be3a08eae00736fe0777bdb0c259cdff.zip
xdisp.c (note_mouse_highlight): Don't do highlight if pointer is invisible (Bug#5766).
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xdisp.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ceb9cad4d88..25182378fd0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12010-03-30 Jan Djärv <jan.h.d@swipnet.se>
2
3 * xdisp.c (note_mouse_highlight): Don't do highlight if pointer is
4 invisible (Bug#5766).
5
12010-03-29 Adrian Robert <adrian.b.robert@gmail.com> 62010-03-29 Adrian Robert <adrian.b.robert@gmail.com>
2 7
3 * xdisp.c (x_consider_frame_title, update_window_cursor): Remove 8 * xdisp.c (x_consider_frame_title, update_window_cursor): Remove
diff --git a/src/xdisp.c b/src/xdisp.c
index 81b97b25c1c..1b6cbfbe27a 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -23551,7 +23551,8 @@ note_mouse_highlight (f, x, y)
23551#endif 23551#endif
23552 23552
23553 if (NILP (Vmouse_highlight) 23553 if (NILP (Vmouse_highlight)
23554 || !f->glyphs_initialized_p) 23554 || !f->glyphs_initialized_p
23555 || f->pointer_invisible)
23555 return; 23556 return;
23556 23557
23557 dpyinfo->mouse_face_mouse_x = x; 23558 dpyinfo->mouse_face_mouse_x = x;