[Emacs-diffs] Changes to emacs/src/emacs.c

[Eli Zaretskii]

Index: emacs/src/emacs.c
diff -u emacs/src/emacs.c:1.384 emacs/src/emacs.c:1.385
--- emacs/src/emacs.c:1.384     Tue Jan  3 08:40:26 2006
+++ emacs/src/emacs.c   Sat Mar 18 13:48:33 2006
@@ -53,6 +53,10 @@
 #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 @@
 
     /* 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