aboutsummaryrefslogtreecommitdiffstats
path: root/src/nsterm.h
diff options
context:
space:
mode:
authorJan Djärv2014-11-08 17:32:37 +0100
committerJan Djärv2014-11-08 17:32:37 +0100
commit86b1c771e14efcc98f8fe07510a4238bf94ced7b (patch)
treecb7e51bb948167a22af7638f6a8454cbd6e13d5c /src/nsterm.h
parent89be8b92a6678ca14cf8f48bdb905542f3b58b9e (diff)
downloademacs-86b1c771e14efcc98f8fe07510a4238bf94ced7b.tar.gz
emacs-86b1c771e14efcc98f8fe07510a4238bf94ced7b.zip
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
Diffstat (limited to 'src/nsterm.h')
-rw-r--r--src/nsterm.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nsterm.h b/src/nsterm.h
index eb2165a89d3..cc5ec0d014b 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -100,7 +100,7 @@ typedef float EmacsCGFloat;
100/* We override sendEvent: as a means to stop/start the event loop */ 100/* We override sendEvent: as a means to stop/start the event loop */
101@interface EmacsApp : NSApplication 101@interface EmacsApp : NSApplication
102{ 102{
103#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9 103#ifdef NS_IMPL_COCOA
104 BOOL shouldKeepRunning; 104 BOOL shouldKeepRunning;
105 BOOL isFirst; 105 BOOL isFirst;
106#endif 106#endif