diff options
| author | Karoly Lorentey | 2005-03-07 16:39:57 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2005-03-07 16:39:57 +0000 |
| commit | 1a27213c2f43c5edc0774ab8a040cf56d6a5ebcc (patch) | |
| tree | be727510e9b1acec4c5bc46a40899fb0dd97e7e7 /src | |
| parent | a0d878a9ccbfb7c68dd7cfbe05c2b71b9bd5c830 (diff) | |
| download | emacs-1a27213c2f43c5edc0774ab8a040cf56d6a5ebcc.tar.gz emacs-1a27213c2f43c5edc0774ab8a040cf56d6a5ebcc.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/xterm.c | 5 |
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 | |||
| 380 | x_flush (f) | 380 | x_flush (f) |
| 381 | struct frame *f; | 381 | struct frame *f; |
| 382 | { | 382 | { |
| 383 | /* Don't call XFlush when it is not safe to redisplay; the X | ||
| 384 | connection may be broken. */ | ||
| 385 | if (!NILP (Vinhibit_redisplay)) | ||
| 386 | return; | ||
| 387 | |||
| 383 | BLOCK_INPUT; | 388 | BLOCK_INPUT; |
| 384 | if (f == NULL) | 389 | if (f == NULL) |
| 385 | { | 390 | { |