* 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 7688664c45de484651011b8c203b24e32ba7145f..92dc093e9e01e2ed1396fc8b81476ae602cd19b6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-11  Micha\e,Ak\e(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 ff7758c7538660cdd6621e709a33a99325bb061f..c0acc738c783f38837122fdd9e9ae0a98b0e3f97 100644 (file)
--- 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