diff options
| author | Glenn Morris <rgm@gnu.org> | 2007-09-21 02:41:05 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2007-09-21 02:41:05 +0000 |
| commit | ea1bf8c799487bf27aa5bc92ed443bcea0717aa3 (patch) | |
| tree | c0f14e495722b7543017a062e0bb924c5ee91a17 | |
| parent | 8db04dd25be86ad9a27f65f5732c4cc7fa729309 (diff) | |
| download | emacs-ea1bf8c799487bf27aa5bc92ed443bcea0717aa3.tar.gz emacs-ea1bf8c799487bf27aa5bc92ed443bcea0717aa3.tar.bz2 emacs-ea1bf8c799487bf27aa5bc92ed443bcea0717aa3.zip | |
Markus Triska <markus.triska at gmx.at>
(x_delete_display): Compile session management conditionally.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xterm.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 13ae3a20dd6..2fc10979176 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2007-09-21 Markus Triska <markus.triska@gmx.at> + + * xterm.c (x_delete_display): Compile session management + conditionally. + 2007-09-20 Stefan Monnier <monnier@iro.umontreal.ca> * callproc.c (getenv_internal_1): New function. diff --git a/src/xterm.c b/src/xterm.c index dc69af88a12..c67238b2234 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -11136,10 +11136,11 @@ x_delete_display (dpyinfo) for (t = terminal_list; t; t = t->next_terminal) if (t->type == output_x_window && t->display_info.x == dpyinfo) { +#ifdef HAVE_X_SM /* Close X session management when we close its display. */ if (t->id == 1 && x_session_have_connection ()) x_session_close(); - +#endif delete_terminal (t); break; } |