* dispnew.c (init_display): Check DISPLAY here.

* emacs.c (main): Don't check here.
* xterm.c (x_display_ok): Don't use DISPLAY env var.

1 files changed, 7 insertions, 0 deletions

diff --git a/src/dispnew.c b/src/dispnew.c
index f6ce8eb43f4..ff7758c7538 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -6664,6 +6664,13 @@ init_display ()
 #endif
 
       display_arg = (display != 0 && *display != 0);
+
+      if (display_arg && !x_display_ok (display))
+        {
+          fprintf (stderr, "Display %s unavailable, simulating -nw\n",
+                   display);
+          inhibit_window_system = 1;
+        }
     }
 
   if (!inhibit_window_system && display_arg