Index: src/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.4998
diff -b -c -w -r1.4998 ChangeLog
*** src/ChangeLog	11 Apr 2006 07:13:33 -0000	1.4998
--- src/ChangeLog	11 Apr 2006 19:35:22 -0000
***************
*** 1,3 ****
--- 1,8 ----
+ 2006-04-11  Michaël 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-11  Dan Nicolaescu  <dann@ics.uci.edu>
  
  	* lisp.h (wrong_type_argument): Mark as NO_RETURN.
Index: src/dispnew.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/dispnew.c,v
retrieving revision 1.361
diff -b -c -w -r1.361 dispnew.c
*** src/dispnew.c	20 Mar 2006 22:41:12 -0000	1.361
--- src/dispnew.c	11 Apr 2006 19:35:22 -0000
***************
*** 6654,6660 ****
       try to use X, and die with an error message if that doesn't work.  */
  
  #ifdef HAVE_X_WINDOWS
!   if (! display_arg)
      {
        char *display;
  #ifdef VMS
--- 6654,6660 ----
       try to use X, and die with an error message if that doesn't work.  */
  
  #ifdef HAVE_X_WINDOWS
!   if (!inhibit_window_system && !display_arg)
      {
        char *display;
  #ifdef VMS