From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Markus Triska Newsgroups: gmane.emacs.devel,gmane.emacs.pretest.bugs Subject: 23.0.50; xterm.c patch: conditional compilation for session management Date: Sun, 16 Sep 2007 15:46:14 +0200 Message-ID: <863axeena1.fsf@gmx.at> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1189950362 29315 80.91.229.12 (16 Sep 2007 13:46:02 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sun, 16 Sep 2007 13:46:02 +0000 (UTC) To: emacs-pretest-bug@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Sep 16 15:46:00 2007 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1IWuRk-000844-Du for ged-emacs-devel@m.gmane.org; Sun, 16 Sep 2007 15:46:00 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IWuRj-0008QP-A3 for ged-emacs-devel@m.gmane.org; Sun, 16 Sep 2007 09:45:59 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IWuRf-0008QG-0z for emacs-devel@gnu.org; Sun, 16 Sep 2007 09:45:55 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IWuRd-0008OE-1M for emacs-devel@gnu.org; Sun, 16 Sep 2007 09:45:54 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IWuRc-0008O2-Ul for emacs-devel@gnu.org; Sun, 16 Sep 2007 09:45:52 -0400 Original-Received: from fencepost.gnu.org ([140.186.70.10]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IWuRc-0000GH-NM for emacs-devel@gnu.org; Sun, 16 Sep 2007 09:45:52 -0400 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by fencepost.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IWuR8-0002bx-AM for emacs-pretest-bug@gnu.org; Sun, 16 Sep 2007 09:45:22 -0400 Original-Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1IWuRY-0000Ff-N4 for emacs-pretest-bug@gnu.org; Sun, 16 Sep 2007 09:45:52 -0400 Original-Received: from mail.gmx.net ([213.165.64.20]) by monty-python.gnu.org with smtp (Exim 4.60) (envelope-from ) id 1IWuRY-0000FP-6K for emacs-pretest-bug@gnu.org; Sun, 16 Sep 2007 09:45:48 -0400 Original-Received: (qmail invoked by alias); 16 Sep 2007 13:45:47 -0000 Original-Received: from chello062178240212.3.14.tuwien.teleweb.at (EHLO siduxbox) [62.178.240.212] by mail.gmx.net (mp032) with SMTP; 16 Sep 2007 15:45:47 +0200 X-Authenticated: #4064391 X-Provags-ID: V01U2FsdGVkX19ydVATJq1yqb/pBP0MgxlOmHi5Uxy8Q0vHf4KV+5 Ky3CIMmThW7BJp X-Y-GMX-Trusted: 0 X-Detected-Kernel: Linux 2.6, seldom 2.4 (older, 4) X-Detected-Kernel: Linux 2.6, seldom 2.4 (older, 4) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:79037 gmane.emacs.pretest.bugs:19892 Archived-At: Following patch yields conditional compilation of session management functions in one additional place in xterm.c. 2007-09-16 Markus Triska * xterm.c (x_delete_display): compile session management conditionally diff --git a/src/xterm.c b/src/xterm.c index fcf5e0b..cdd2c5c 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -11136,9 +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;