# HG changeset patch
# User Jan Dj¸«£rv <jan.h.d@swipnet.se>
# Date 1144822992 0
# Node ID b9da898695a51ea6eb2800caea7348bd2a8162f8
# Parent  03ab16f0dbb310755f9c9878cd2dfa06cb1b9901
* dispnew.c (init_display): Don't init X display if the user asked
for a non-X display.

diff -r 03ab16f0dbb3 -r b9da898695a5 src/ChangeLog
--- a/src/ChangeLog	Wed Apr 12 05:48:37 2006 +0000
+++ b/src/ChangeLog	Wed Apr 12 06:23:12 2006 +0000
@@ -1,3 +1,8 @@
+2006-04-11  Micha,Ak(Bl Cadilhac  <michael.cadilhac@lrde.org> (tiny change)
+
+	* dispnew.c (init_display): Don't init X display if the user asked
+	for a non-X display.
+	
 2006-04-12  Kenichi Handa  <handa@m17n.org>
 
 	* coding.c (setup_coding_system): Use system_eol_type for default
diff -r 03ab16f0dbb3 -r b9da898695a5 src/dispnew.c
--- a/src/dispnew.c	Wed Apr 12 05:48:37 2006 +0000
+++ b/src/dispnew.c	Wed Apr 12 06:23:12 2006 +0000
@@ -6654,7 +6654,7 @@
      try to use X, and die with an error message if that doesn't work.  */
 
 #ifdef HAVE_X_WINDOWS
-  if (! display_arg)
+  if (! inhibit_window_system && ! display_arg)
     {
       char *display;
 #ifdef VMS