aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2007-09-21 02:41:05 +0000
committerGlenn Morris2007-09-21 02:41:05 +0000
commitea1bf8c799487bf27aa5bc92ed443bcea0717aa3 (patch)
treec0f14e495722b7543017a062e0bb924c5ee91a17
parent8db04dd25be86ad9a27f65f5732c4cc7fa729309 (diff)
downloademacs-ea1bf8c799487bf27aa5bc92ed443bcea0717aa3.tar.gz
emacs-ea1bf8c799487bf27aa5bc92ed443bcea0717aa3.zip
Markus Triska <markus.triska at gmx.at>
(x_delete_display): Compile session management conditionally.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xterm.c3
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 @@
12007-09-21 Markus Triska <markus.triska@gmx.at>
2
3 * xterm.c (x_delete_display): Compile session management
4 conditionally.
5
12007-09-20 Stefan Monnier <monnier@iro.umontreal.ca> 62007-09-20 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * callproc.c (getenv_internal_1): New function. 8 * 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)
11136 for (t = terminal_list; t; t = t->next_terminal) 11136 for (t = terminal_list; t; t = t->next_terminal)
11137 if (t->type == output_x_window && t->display_info.x == dpyinfo) 11137 if (t->type == output_x_window && t->display_info.x == dpyinfo)
11138 { 11138 {
11139#ifdef HAVE_X_SM
11139 /* Close X session management when we close its display. */ 11140 /* Close X session management when we close its display. */
11140 if (t->id == 1 && x_session_have_connection ()) 11141 if (t->id == 1 && x_session_have_connection ())
11141 x_session_close(); 11142 x_session_close();
11142 11143#endif
11143 delete_terminal (t); 11144 delete_terminal (t);
11144 break; 11145 break;
11145 } 11146 }