1 files changed, 5 insertions, 0 deletions

diff --git a/src/xterm.c b/src/xterm.c
index aa3f8b1a8b5..56e3f8f9231 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -380,6 +380,11 @@ static void
 x_flush (f)
      struct frame *f;
 {
+  /* Don't call XFlush when it is not safe to redisplay; the X
+     connection may be broken.  */
+  if (!NILP (Vinhibit_redisplay))
+    return;
+
   BLOCK_INPUT;
   if (f == NULL)
     {