[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100280: * xsmfns.c (smc_die_CB): Call Fkill_emacs.

[Jan D.]

------------------------------------------------------------
revno: 100280
committer: Jan D. <address@hidden>
branch nick: emacs-23
timestamp: Tue 2010-12-07 07:36:25 +0100
message:
  * xsmfns.c (smc_die_CB): Call Fkill_emacs.
modified:
  src/ChangeLog
  src/xsmfns.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-12-06 06:54:52 +0000
+++ b/src/ChangeLog     2010-12-07 06:36:25 +0000
@@ -1,3 +1,7 @@
+2010-12-07  Jan Djärv  <address@hidden>
+
+       * xsmfns.c (smc_die_CB): Call Fkill_emacs (Bug#7552).
+
 2010-12-06  Chong Yidong  <address@hidden>
 
        * dispextern.h (struct it): New member overlay_strings_charpos.

=== modified file 'src/xsmfns.c'
--- a/src/xsmfns.c      2010-02-10 09:29:28 +0000
+++ b/src/xsmfns.c      2010-12-07 06:36:25 +0000
@@ -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 ();
 }