From: Jan Djärv <jan.h.d@swipnet.se>
Date: Wed, 20 Nov 2013 18:33:12 +0000 (+0100)
Subject: * nsterm.m (init, run, stop:): Enable again. stop calls super stop
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~769
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cab0d91dfb3a3f29a7208cfbc4fc2c5537e6aee4;p=emacs.git

* nsterm.m (init, run, stop:): Enable again. stop calls super stop
to handle dialogs.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 2b22e09461f..e0ac7f298c7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2013-11-20  Jan Djärv  <jan.h.d@swipnet.se>
 
+	* nsterm.m (init, run, stop:): Enable again. stop calls super stop
+	to handle dialogs.
+
 	* nsterm.m (init, run, stop:): Comment out for now, does not work
 	with dialogs.
 
diff --git a/src/nsterm.m b/src/nsterm.m
index 991be1f0396..aa9f2af35d8 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -4367,7 +4367,6 @@ ns_term_shutdown (int sig)
 
 @implementation EmacsApp
 
-#if 0
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9
 - (id)init
 {
@@ -4386,7 +4385,7 @@ ns_term_shutdown (int sig)
 
     shouldKeepRunning = YES;
     do
-    {
+      {
         [pool release];
         pool = [[NSAutoreleasePool alloc] init];
 
@@ -4405,9 +4404,11 @@ ns_term_shutdown (int sig)
 - (void)stop: (id)sender
 {
     shouldKeepRunning = NO;
+    // Stop possible dialog also.  Noop if no dialog present.
+    // The file dialog still leaks 7k - 10k on 10.9 though.
+    [super stop:sender];
 }
 #endif
-#endif
 
 - (void)logNotification: (NSNotification *)notification
 {