From: Jan Djärv <jan.h.d@swipnet.se>
Date: Wed, 12 Apr 2006 06:23:12 +0000 (+0000)
Subject: * dispnew.c (init_display): Don't init X display if the user asked
X-Git-Tag: emacs-pretest-22.0.90~3199
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=00d70d574cb89c3096761ec10c8de31db58ddf41;p=emacs.git

* dispnew.c (init_display): Don't init X display if the user asked
for a non-X display.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 7688664c45d..92dc093e9e0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/dispnew.c b/src/dispnew.c
index ff7758c7538..c0acc738c78 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -6654,7 +6654,7 @@ init_display ()
      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