* xsmfns.c (smc_die_CB): Call Fkill_emacs.

Fixes: debbugs:7552

* xsmfns.c (smc_die_CB): Call Fkill_emacs.
Fixes: debbugs:7552
2b815743 · Jan Djärv · e49fb298 · 2b815743 · 2b815743
Commit 2b815743 authored Dec 07, 2010 by Jan Djärv
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

src/ChangeLog src/ChangeLog +4 -0

src/xsmfns.c src/xsmfns.c +4 -0

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+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
+++ b/src/xsmfns.c
@@ -298,6 +298,10 @@ smc_die_CB (smcConn, clientData)
     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 ();
 }