diff options
| author | Karoly Lorentey | 2006-05-20 10:32:11 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2006-05-20 10:32:11 +0000 |
| commit | aabd1a8b138a7f5907c3bb0bbd40932fa7b8e9fe (patch) | |
| tree | 7db1ed5481ec4ec6b43271d0ea57c032c22f60fc /src/xterm.c | |
| parent | 9f97e26d01003a17b861505d535c89ad73799b7e (diff) | |
| parent | 689840b9224725a0beae741aaaa325d7edb2244c (diff) | |
| download | emacs-aabd1a8b138a7f5907c3bb0bbd40932fa7b8e9fe.tar.gz emacs-aabd1a8b138a7f5907c3bb0bbd40932fa7b8e9fe.zip | |
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-285
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-286
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-287
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-288
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-102
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-558
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/xterm.c b/src/xterm.c index 1c07c56241e..2070c65d76a 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -6097,6 +6097,8 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit) | |||
| 6097 | 6097 | ||
| 6098 | f = x_any_window_to_frame (dpyinfo, event.xkey.window); | 6098 | f = x_any_window_to_frame (dpyinfo, event.xkey.window); |
| 6099 | 6099 | ||
| 6100 | /* If mouse-highlight is an integer, input clears out | ||
| 6101 | mouse highlighting. */ | ||
| 6100 | if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight) | 6102 | if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight) |
| 6101 | && (f == 0 | 6103 | && (f == 0 |
| 6102 | || !EQ (f->tool_bar_window, dpyinfo->mouse_face_window))) | 6104 | || !EQ (f->tool_bar_window, dpyinfo->mouse_face_window))) |