From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Mon, 15 Jan 2007 08:10:22 +0000 (+0000)
Subject: (mac-ae-quit-application): New function.
X-Git-Tag: emacs-pretest-22.0.93~136
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=025a24b5bcc2c70a28ed208b45cdb7bfc1d6d7a1;p=emacs.git

(mac-ae-quit-application): New function.
(mac-apple-event-map): Bind "quit application" Apple event to it.
---

diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index 3ba38680989..db07315fe84 100644
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -1714,6 +1714,15 @@ in `selection-converter-alist', which see."
 	      nil t)))))
   (select-frame-set-input-focus (selected-frame)))
 
+(defun mac-ae-quit-application (event)
+  "Quit the application Emacs with the Apple event EVENT."
+  (interactive "e")
+  (let ((ae (mac-event-ae event)))
+    (unwind-protect
+	(save-buffers-kill-emacs)
+      ;; Reaches here if the user has canceled the quit.
+      (mac-resume-apple-event ae -128)))) ; userCanceledErr
+
 (defun mac-ae-get-url (event)
   "Open the URL specified by the Apple event EVENT.
 Currently the `mailto' scheme is supported."
@@ -1740,7 +1749,7 @@ Currently the `mailto' scheme is supported."
   'mac-ae-open-documents)
 (define-key mac-apple-event-map [core-event show-preferences] 'customize)
 (define-key mac-apple-event-map [core-event quit-application]
-  'save-buffers-kill-emacs)
+  'mac-ae-quit-application)
 
 (define-key mac-apple-event-map [internet-event get-url] 'mac-ae-get-url)