2 files changed, 6 insertions, 10 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index 9c41fa91351..2c6edc68f99 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -6589,14 +6589,6 @@ read_avail_input (expected)
   int err;
   struct display *d;
 
-  if (interrupt_input_blocked)
-    {
-      interrupt_input_pending = 1;
-      return -1;
-    }
-
-  BLOCK_INPUT;
-
   /* Loop through the available displays, and call their input hooks. */
   d = display_list;
   while (d)
@@ -6669,8 +6661,6 @@ read_avail_input (expected)
   if (err && !nread)
     nread = -1;
 
-  UNBLOCK_INPUT;
-
   return nread;
 }
 
diff --git a/src/xterm.c b/src/xterm.c
index 321e9fa3f2f..90356b2ed2f 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7209,6 +7209,12 @@ XTread_socket (display, bufp, numchars, expected)
         {
           int finish;
 
+          if (numchars <= 1)
+            {
+              /* The input buffer is full; read the rest next time. */
+              break;
+            }
+
           XNextEvent (dpyinfo->display, &event);
 
 #ifdef HAVE_X_I18N