Mercurial > emacs

changeset 70652:fc5f994a4079

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* xterm.c (handle_one_xevent): Check that f is not NULL before calling _XEditResCheckMessages.
author Jan Djärv <jan.h.d@swipnet.se>
date Sun, 14 May 2006 11:26:20 +0000
parents 54d96a288372
children 019755175634
files src/ChangeLog src/xterm.c
diffstat 2 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Sun May 14 00:30:46 2006 +0000
+++ b/src/ChangeLog	Sun May 14 11:26:20 2006 +0000
@@ -1,3 +1,8 @@
+2006-05-14  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* xterm.c (handle_one_xevent): Check that f is not NULL before
+	calling _XEditResCheckMessages.
+
 2006-05-14  Kim F. Storm  <storm@cua.dk>
 
 	* xterm.c (handle_one_xevent): Fix crash in 2006-03-24 change.
--- a/src/xterm.c	Sun May 14 00:30:46 2006 +0000
+++ b/src/xterm.c	Sun May 14 11:26:20 2006 +0000
@@ -5803,8 +5803,9 @@
 	    == dpyinfo->Xatom_editres)
           {
 	    f = x_any_window_to_frame (dpyinfo, event.xclient.window);
-            _XEditResCheckMessages (f->output_data.x->widget, NULL,
-                                    &event, NULL);
+	    if (f)
+              _XEditResCheckMessages (f->output_data.x->widget, NULL,
+                                      &event, NULL);
 	    goto done;
           }
 #endif /* HACK_EDITRES */