1 files changed, 12 insertions, 0 deletions

diff --git a/src/emacs.c b/src/emacs.c
index 846bfc7e453..259c8c3381e 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -53,6 +53,10 @@ Boston, MA 02110-1301, USA.  */
 #include "buffer.h"
 #include "window.h"
 
+#ifdef HAVE_X_WINDOWS
+#include "xterm.h"
+#endif
+
 #include "systty.h"
 #include "blockinput.h"
 #include "syssignal.h"
@@ -1482,6 +1486,14 @@ main (argc, argv
 
     /* Don't actually discard this arg.  */
     skip_args = count_before;
+
+    /* Do not be lenient if the user explicitly asked for a named display.  */
+    if (display_arg != 1 && !x_display_ok (displayname))
+      {
+        fprintf (stderr, "Display %s unavailable, simulating -nw\n",
+                 displayname);
+        inhibit_window_system = 1;
+      }
   }
 #endif