From: Richard M. Stallman <rms@gnu.org>
Date: Thu, 29 Aug 1996 06:22:28 +0000 (+0000)
Subject: (XTread_socket): Call XFilterEvent on all events,
X-Git-Tag: emacs-20.1~3971
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=531483fbd3a89e58858b733bad5b467511e1b0a7;p=emacs.git

(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 e98a2c5b0f5..d264c0a322c 100644
--- 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,