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

[Andreas Schwab]

Index: emacs/src/emacs.c
diff -u emacs/src/emacs.c:1.386 emacs/src/emacs.c:1.387
--- emacs/src/emacs.c:1.386     Mon Mar 20 20:33:33 2006
+++ emacs/src/emacs.c   Mon Mar 20 22:41:16 2006
@@ -53,10 +53,6 @@
 #include "buffer.h"
 #include "window.h"
 
-#ifdef HAVE_X_WINDOWS
-#include "xterm.h"
-#endif
-
 #include "systty.h"
 #include "blockinput.h"
 #include "syssignal.h"
@@ -1486,14 +1482,6 @@
 
     /* 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