Mercurial > emacs

diff src/dispnew.c @ 69607:761eaec1aae4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* 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.
author Andreas Schwab <schwab@suse.de>
date Mon, 20 Mar 2006 22:41:23 +0000
parents 9d86d35acf33
children b9da898695a5 b901f4f12f33 e6bf73e43cf4
line wrap: on
line diff
--- a/src/dispnew.c	Mon Mar 20 22:22:25 2006 +0000
+++ b/src/dispnew.c	Mon Mar 20 22:41:23 2006 +0000
@@ -6664,6 +6664,13 @@
 #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