From: Karoly Lorentey <lorentey@elte.hu>
Date: Mon, 7 Mar 2005 16:39:57 +0000 (+0000)
Subject: Fix crash condition when an X server connection is broken. (Reported by Vincent Bernat.)
X-Git-Tag: emacs-pretest-23.0.90~11236^2~141^2~296
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1a27213c2f43c5edc0774ab8a040cf56d6a5ebcc;p=emacs.git

Fix crash condition when an X server connection is broken. (Reported by Vincent Bernat.)

* src/xterm.c (x_flush): Return immediately when redisplay is inhibited.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-304
---

diff --git a/README.multi-tty b/README.multi-tty
index d2bbabcabae..1dc75afb390 100644
--- a/README.multi-tty
+++ b/README.multi-tty
@@ -32,6 +32,7 @@ contributed to the project by testing, submitting patches, bug
 reports, and suggestions.  Thanks!
 
 ARISAWA Akihiro <ari at mbf dot ocn dot ne dot jp>
+Vincent Bernat <bernat at luffy dot cx>
 Han Boetes <han at mijncomputer dot nl>
 Robert J. Chassell <bob at rattlesnake dot com>
 Romain Francoise <romain at orebokech dot com>
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)
     {