(XTread_socket): Call XFilterEvent on all events,

if HAVE_X_I18N and FRAME_XIC nonzero.

diff --git a/src/xterm.c b/src/xterm.c
index e98a2c5b0f517e611ebffdad1c5107c211d021b4..d264c0a322c0a1fcf4a80ef84a1e4682ce8e1b67 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -3323,6 +3323,12 @@ XTread_socket (sd, bufp, numchars, waitp, expected)
          XtAppNextEvent (Xt_app_con, &event);
 #else
          XNextEvent (dpyinfo->display, &event);
+#endif
+#ifdef HAVE_X_I18N
+         /* The necessity of the following line took me
+            a full work-day to decipher from the docs!!  */
+         if (FRAME_XIC (f) && XFilterEvent (&event, None))
+           break;
 #endif
          event_found = 1;
 
@@ -3667,10 +3673,6 @@ XTread_socket (sd, bufp, numchars, waitp, expected)
 #ifdef HAVE_X_I18N
                  if (FRAME_XIC (f))
                    {
-                     /* The necessity of the following line took me
-                        a full work-day to decipher from the docs!!  */
-                     if (XFilterEvent (&event, None))
-                       break;
                      nbytes = XmbLookupString (FRAME_XIC (f),
                                                &event.xkey, copy_buffer,
                                                80, &keysym,