From: Glenn Morris Date: Fri, 21 Sep 2007 02:41:05 +0000 (+0000) Subject: Markus Triska X-Git-Tag: emacs-pretest-23.0.90~10792 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ea1bf8c799487bf27aa5bc92ed443bcea0717aa3;p=emacs.git Markus Triska (x_delete_display): Compile session management conditionally. --- 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 + + * xterm.c (x_delete_display): Compile session management + conditionally. + 2007-09-20 Stefan Monnier * 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; }