aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2006-02-13 11:34:20 +0000
committerJan Djärv2006-02-13 11:34:20 +0000
commit0c0351b5994bd23b215ab3f744cadd6a8e71d453 (patch)
tree2bcd46ca16df784c698e0ac954c813286ffb48bf /src
parent50d16788f2586ba58b3f10824ab770633b6e0870 (diff)
downloademacs-0c0351b5994bd23b215ab3f744cadd6a8e71d453.tar.gz
emacs-0c0351b5994bd23b215ab3f744cadd6a8e71d453.zip
* xterm.c (note_mouse_movement): Check for NULL FRAME_X_OUTPUT (frame).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xterm.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index bd6d28aad6a..6c5fa163938 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12006-02-13 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2
3 * xterm.c (note_mouse_movement): Check for NULL FRAME_X_OUTPUT (frame).
4
12006-02-12 Richard M. Stallman <rms@gnu.org> 52006-02-12 Richard M. Stallman <rms@gnu.org>
2 6
3 * cmds.c (internal_self_insert): Handle weird auto-fill-function. 7 * cmds.c (internal_self_insert): Handle weird auto-fill-function.
diff --git a/src/xterm.c b/src/xterm.c
index e3407dcaaec..6ab8b8db487 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -3592,6 +3592,10 @@ note_mouse_movement (frame, event)
3592 last_mouse_motion_event = *event; 3592 last_mouse_motion_event = *event;
3593 XSETFRAME (last_mouse_motion_frame, frame); 3593 XSETFRAME (last_mouse_motion_frame, frame);
3594 3594
3595 if (!FRAME_X_OUTPUT (frame)) {
3596 return 0;
3597 }
3598
3595 if (event->window != FRAME_X_WINDOW (frame)) 3599 if (event->window != FRAME_X_WINDOW (frame))
3596 { 3600 {
3597 frame->mouse_moved = 1; 3601 frame->mouse_moved = 1;