diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xsmfns.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 94cc2712dc1..6f9952faf45 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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. diff --git a/src/xsmfns.c b/src/xsmfns.c index ec5ca3b1a9f..f6260d00a56 100644 --- 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 (); } |