aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2006-05-14 11:26:20 +0000
committerJan Djärv2006-05-14 11:26:20 +0000
commit79fb0ab7fac07f38a670e159278f90fedbd8afb6 (patch)
treeb714f279a026f67bb3865e5e1d5990f51a14be61 /src
parent295fa1d4722339a1aa66c13636ddd2201f0c679d (diff)
downloademacs-79fb0ab7fac07f38a670e159278f90fedbd8afb6.tar.gz
emacs-79fb0ab7fac07f38a670e159278f90fedbd8afb6.zip
* xterm.c (handle_one_xevent): Check that f is not NULL before
calling _XEditResCheckMessages.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xterm.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 06f807e5e7f..a4b78542ee3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12006-05-14 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2
3 * xterm.c (handle_one_xevent): Check that f is not NULL before
4 calling _XEditResCheckMessages.
5
12006-05-14 Kim F. Storm <storm@cua.dk> 62006-05-14 Kim F. Storm <storm@cua.dk>
2 7
3 * xterm.c (handle_one_xevent): Fix crash in 2006-03-24 change. 8 * xterm.c (handle_one_xevent): Fix crash in 2006-03-24 change.
diff --git a/src/xterm.c b/src/xterm.c
index 3ef756bd42f..bc28f397073 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -5803,8 +5803,9 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
5803 == dpyinfo->Xatom_editres) 5803 == dpyinfo->Xatom_editres)
5804 { 5804 {
5805 f = x_any_window_to_frame (dpyinfo, event.xclient.window); 5805 f = x_any_window_to_frame (dpyinfo, event.xclient.window);
5806 _XEditResCheckMessages (f->output_data.x->widget, NULL, 5806 if (f)
5807 &event, NULL); 5807 _XEditResCheckMessages (f->output_data.x->widget, NULL,
5808 &event, NULL);
5808 goto done; 5809 goto done;
5809 } 5810 }
5810#endif /* HACK_EDITRES */ 5811#endif /* HACK_EDITRES */