[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r117687: Attempt to fix NS hang. Will probably ca
From: |
Jan D. |
Subject: |
[Emacs-diffs] emacs-24 r117687: Attempt to fix NS hang. Will probably cause merge conflicts. |
Date: |
Sat, 08 Nov 2014 16:32:48 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117687
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18993
committer: Jan D. <address@hidden>
branch nick: emacs-24
timestamp: Sat 2014-11-08 17:32:37 +0100
message:
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.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/nsterm.h nsterm.h-20091113204419-o5vbwnq5f7feedwu-8746
src/nsterm.m nsterm.m-20091113204419-o5vbwnq5f7feedwu-8747
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-11-07 14:45:34 +0000
+++ b/src/ChangeLog 2014-11-08 16:32:37 +0000
@@ -1,3 +1,9 @@
+2014-11-08 Jan Djärv <address@hidden>
+
+ * 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 <address@hidden>
* callproc.c (encode_current_directory): Support handling of file
=== modified file 'src/nsterm.h'
--- a/src/nsterm.h 2014-10-30 19:15:38 +0000
+++ b/src/nsterm.h 2014-11-08 16:32:37 +0000
@@ -100,7 +100,7 @@
/* 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
=== modified file 'src/nsterm.m'
--- a/src/nsterm.m 2014-10-30 17:23:52 +0000
+++ b/src/nsterm.m 2014-11-08 16:32:37 +0000
@@ -4452,7 +4452,7 @@
{
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 @@
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 @@
// The file dialog still leaks 7k - 10k on 10.9 though.
[super stop:sender];
}
-#endif
+#endif /* NS_IMPL_COCOA */
- (void)logNotification: (NSNotification *)notification
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r117687: Attempt to fix NS hang. Will probably cause merge conflicts.,
Jan D. <=