diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2006-04-12 06:23:12 +0000 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2006-04-12 06:23:12 +0000 |
| commit | 00d70d574cb89c3096761ec10c8de31db58ddf41 (patch) | |
| tree | 9248755d85efded9b15867f0ab516e1f8b68ff14 | |
| parent | 957b3c5f2f6280605908e0b7694bead9539082b4 (diff) | |
| download | emacs-00d70d574cb89c3096761ec10c8de31db58ddf41.tar.gz | |
* dispnew.c (init_display): Don't init X display if the user asked
for a non-X display.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/dispnew.c | 2 |
2 files changed, 6 insertions, 1 deletions
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 |