Don't exit Emacs when the X display is closed during a tty-X combo session.

src/xterm.c (x_delete_display): Fix semantic typo.
(x_connection_closed): When deciding whether or not to shut down
Emacs, check for remaining elements in display_list, not
x_display_list.

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

1 files changed, 2 insertions, 2 deletions

diff --git a/src/xterm.c b/src/xterm.c
index 8832991156d..ffbe4ded419 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7866,7 +7866,7 @@ x_connection_closed (dpy, error_message)
 
   x_uncatch_errors (dpy, count);
 
-  if (x_display_list == 0)
+  if (display_list == 0)
     {
       fprintf (stderr, "%s\n", error_msg);
       shut_down_emacs (0, 0, Qnil);
@@ -10748,7 +10748,7 @@ x_delete_display (dpyinfo)
     /* Delete the generic struct display for this X display. */
     struct display *d;
     for (d = display_list; d; d = d->next_display)
-      if (d->type == output_x_window && d->display_info.x != dpyinfo)
+      if (d->type == output_x_window && d->display_info.x == dpyinfo)
         {
           delete_display (d);
           break;