Commit 86b1c771 authored by Jan Djärv's avatar Jan Djärv

Attempt to fix NS hang. Will probably cause merge conflicts.

* nsterm.m (init): Replace OSX 10.9 check with IMPL_COCOA.
(run): Ditto.  Only use non-system event loop if OSX version is
exactly 10.9.

Fixes: debbugs:18993
parent 89be8b92
2014-11-08 Jan Djärv <jan.h.d@swipnet.se>
* nsterm.m (init): Replace OSX 10.9 check with IMPL_COCOA.
(run): Ditto. Only use non-system event loop if OSX version is
exactly 10.9 (Bug#18993).
2014-11-07 Michael Albinus <michael.albinus@gmx.de>
* callproc.c (encode_current_directory): Support handling of file
......
......@@ -100,7 +100,7 @@ typedef float EmacsCGFloat;
/* We override sendEvent: as a means to stop/start the event loop */
@interface EmacsApp : NSApplication
{
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9
#ifdef NS_IMPL_COCOA
BOOL shouldKeepRunning;
BOOL isFirst;
#endif
......
......@@ -4452,7 +4452,7 @@ - (id)init
{
if (self = [super init])
{
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9
#ifdef NS_IMPL_COCOA
self->isFirst = YES;
#endif
#ifdef NS_IMPL_GNUSTEP
......@@ -4463,9 +4463,19 @@ - (id)init
return self;
}
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9
#ifdef NS_IMPL_COCOA
- (void)run
{
#ifndef NSAppKitVersionNumber10_9
#define NSAppKitVersionNumber10_9 1265
#endif
if ((int)NSAppKitVersionNumber != NSAppKitVersionNumber10_9)
{
[super run];
return;
}
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
if (isFirst) [self finishLaunching];
......@@ -4496,7 +4506,7 @@ - (void)stop: (id)sender
// The file dialog still leaks 7k - 10k on 10.9 though.
[super stop:sender];
}
#endif
#endif /* NS_IMPL_COCOA */
- (void)logNotification: (NSNotification *)notification
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment