* nsterm.m (init, run, stop:): Enable again. stop calls super stop

to handle dialogs.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2b22e09461fedd4063b905072e5612f02d2a3bf5..e0ac7f298c7353eea74146ecb6f35bfe2b2f1ab1 100644 (file)
--- 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 991be1f03968b150761dc37d54446b96b4836efe..aa9f2af35d8f39c5237b29abc12b8e4c9054d284 100644 (file)
--- 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
 {