1 files changed, 18 insertions, 0 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index e3e6896d0da..de91b40d295 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -6586,8 +6586,17 @@ read_avail_input (expected)
 {
   register int i;
   int nread = 0;
+  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)
@@ -6625,6 +6634,10 @@ read_avail_input (expected)
                       discard = 1;
                   }
               }
+            else if (nr == -1)          /* Not OK to read input now. */
+              {
+                err = 1;
+              }
             else if (nr == -2)          /* Non-transient error. */
               {
                 /* The display device terminated; it should be closed. */
@@ -6653,6 +6666,11 @@ read_avail_input (expected)
       d = next;
     }
 
+  if (err && !nread)
+    nread = -1;
+
+  UNBLOCK_INPUT;
+
   return nread;
 }