diff options
| author | Kim F. Storm | 2006-03-24 15:24:05 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2006-03-24 15:24:05 +0000 |
| commit | 442a3a967099dbb69724c4e0955c80d52cb76e42 (patch) | |
| tree | db43409e7476918f430fea7093120e948dad9b16 /src/w32term.c | |
| parent | cf1474a2829418212b0c28f43a24fda8359c6267 (diff) | |
| download | emacs-442a3a967099dbb69724c4e0955c80d52cb76e42.tar.gz emacs-442a3a967099dbb69724c4e0955c80d52cb76e42.zip | |
(w32_read_socket): Don't let key-press clear mouse face
on in toolbar window if mouse-highlight is an integer.
Diffstat (limited to 'src/w32term.c')
| -rw-r--r-- | src/w32term.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/w32term.c b/src/w32term.c index 7d530e7ea65..f0ef42f798b 100644 --- a/src/w32term.c +++ b/src/w32term.c | |||
| @@ -4260,7 +4260,8 @@ w32_read_socket (sd, expected, hold_quit) | |||
| 4260 | 4260 | ||
| 4261 | if (f && !f->iconified) | 4261 | if (f && !f->iconified) |
| 4262 | { | 4262 | { |
| 4263 | if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight)) | 4263 | if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight) |
| 4264 | && !EQ (f->tool_bar_window, dpyinfo->mouse_face_window)) | ||
| 4264 | { | 4265 | { |
| 4265 | clear_mouse_face (dpyinfo); | 4266 | clear_mouse_face (dpyinfo); |
| 4266 | dpyinfo->mouse_face_hidden = 1; | 4267 | dpyinfo->mouse_face_hidden = 1; |
| @@ -4283,7 +4284,8 @@ w32_read_socket (sd, expected, hold_quit) | |||
| 4283 | 4284 | ||
| 4284 | if (f && !f->iconified) | 4285 | if (f && !f->iconified) |
| 4285 | { | 4286 | { |
| 4286 | if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight)) | 4287 | if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight) |
| 4288 | && !EQ (f->tool_bar_window, dpyinfo->mouse_face_window)) | ||
| 4287 | { | 4289 | { |
| 4288 | clear_mouse_face (dpyinfo); | 4290 | clear_mouse_face (dpyinfo); |
| 4289 | dpyinfo->mouse_face_hidden = 1; | 4291 | dpyinfo->mouse_face_hidden = 1; |