Mercurial > emacs

changeset 111917:f01ecb2cea43

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* xsmfns.c (smc_die_CB): Call Fkill_emacs.
author Jan D. <jan.h.d@swipnet.se>
date Tue, 07 Dec 2010 07:36:25 +0100
parents e61da61a2c9b
children e71e87e08d5f
files src/ChangeLog src/xsmfns.c
diffstat 2 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Mon Dec 06 15:07:48 2010 -0500
+++ b/src/ChangeLog	Tue Dec 07 07:36:25 2010 +0100
@@ -1,3 +1,7 @@
+2010-12-07  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* xsmfns.c (smc_die_CB): Call Fkill_emacs (Bug#7552).
+
 2010-12-06  Chong Yidong  <cyd@stupidchicken.com>
 
 	* dispextern.h (struct it): New member overlay_strings_charpos.
--- a/src/xsmfns.c	Mon Dec 06 15:07:48 2010 -0500
+++ b/src/xsmfns.c	Tue Dec 07 07:36:25 2010 +0100
@@ -298,6 +298,10 @@
      SmcConn smcConn;
      SmPointer clientData;
 {
+  /* This may behave badly if desktop.el tries to ask questions.  */
+  Fkill_emacs (Qnil);
+
+  /* This will not be reached, but we want kill-emacs-hook to be run.  */
   SmcCloseConnection (smcConn, 0, 0);
   ice_connection_closed ();
 }