Init X display on -nw.

[Michaël Cadilhac]

I've a distant computer that sets the DISPLAY value on ssh, but it has
a so old X server that Emacs can't connect to it. No problem, it's not
due to Emacs.

However, I then use `emacs -nw'.

Well, I don't see the point of this message :

  $ emacs -nw
  Xlib: connection to "localhost:10.0" refused by server
  Xlib: Invalid MIT-MAGIC-COOKIE-1 key
  Display localhost:10.0 unavailable, simulating -nw
  $

Emacs, my dear, please don't simulate, do it.

I propose the following (maybe naive) tiny change :

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  <address@hidden> (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  <address@hidden>
  
        * 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


Thanks in advance.

-- 
 |      Michaël `Micha' Cadilhac   |   Mieux vaut se taire                  |
 |         Epita/LRDE Promo 2007   |    Que de parler trop fort.            |
 | http://www.lrde.org/~cadilh_m   |            -- As de trèfle             |
 `--  -   JID: address@hidden --'                                   -  --'

pgplz_ahiZkGv.pgp
Description: PGP signature