[Emacs-diffs] trunk r115162: * nsterm.m (init, run, stop:): Enable again. stop calls super stop

[Jan D.]

------------------------------------------------------------
revno: 115162
revision-id: address@hidden
parent: address@hidden
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Wed 2013-11-20 19:33:12 +0100
message:
  * nsterm.m (init, run, stop:): Enable again. stop calls super stop
  to handle dialogs.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/nsterm.m                   nsterm.m-20091113204419-o5vbwnq5f7feedwu-8747

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-11-20 13:03:43 +0000
+++ b/src/ChangeLog     2013-11-20 18:33:12 +0000
@@ -1,5 +1,8 @@
 2013-11-20  Jan Djärv  <address@hidden>
 
+       * 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.
 

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2013-11-20 13:03:43 +0000
+++ b/src/nsterm.m      2013-11-20 18:33:12 +0000
@@ -4367,7 +4367,6 @@
 
 @implementation EmacsApp
 
-#if 0
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9
 - (id)init
 {
@@ -4386,7 +4385,7 @@
 
     shouldKeepRunning = YES;
     do
-    {
+      {
         [pool release];
         pool = [[NSAutoreleasePool alloc] init];
 
@@ -4405,9 +4404,11 @@
 - (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
 {