Mercurial > emacs
changeset 69952:b9da898695a5
* dispnew.c (init_display): Don't init X display if the user asked
for a non-X display.
| author | Jan Djärv <jan.h.d@swipnet.se> |
|---|---|
| date | Wed, 12 Apr 2006 06:23:12 +0000 |
| parents | 03ab16f0dbb3 |
| children | 6a69cc2e7e0c |
| files | src/ChangeLog src/dispnew.c |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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