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;
       }