diff options
| author | Alan Third <alan@idiocy.org> | 2016-07-20 21:59:17 +0100 |
|---|---|---|
| committer | Alan Third <alan@idiocy.org> | 2016-08-03 17:19:12 +0100 |
| commit | a6ae47921603da8c28354c120e84507b44a761e5 (patch) | |
| tree | 8e30fabfc13aa4b70863983dcc6b4f8ff5ca7e2b | |
| parent | d35d398bdbeb393f3ebf17918d82c7573562f01e (diff) | |
| download | emacs-a6ae47921603da8c28354c120e84507b44a761e5.tar.gz | |
Post AppDefined events from the main thread ONLY (bug#23934)
* src/nsterm.h: Make nextappdefined var not just GNUStep.
* src/nsterm.c (ns_send_appdefined, sendFromMainThread): Remove GNUStep
| -rw-r--r-- | src/nsterm.h | 2 | ||||
| -rw-r--r-- | src/nsterm.m | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/nsterm.h b/src/nsterm.h index 0aea9cca112..4b246bd3d0f 100644 --- a/src/nsterm.h +++ b/src/nsterm.h @@ -380,9 +380,9 @@ char const * nstrace_fullscreen_type_name (int); #endif #ifdef NS_IMPL_GNUSTEP BOOL applicationDidFinishLaunchingCalled; +#endif @public int nextappdefined; -#endif } - (void)logNotification: (NSNotification *)notification; - (void)antialiasThresholdDidChange:(NSNotification *)notification; diff --git a/src/nsterm.m b/src/nsterm.m index e6a10b89f81..4d9d10559ea 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -3918,8 +3918,8 @@ ns_send_appdefined (int value) { NSTRACE_WHEN (NSTRACE_GROUP_EVENTS, "ns_send_appdefined(%d)", value); -#ifdef NS_IMPL_GNUSTEP // GNUstep needs postEvent to happen on the main thread. + // Cocoa needs nextEventMatchingMask to happen on the main thread too. if (! [[NSThread currentThread] isMainThread]) { EmacsApp *app = (EmacsApp *)NSApp; @@ -3929,7 +3929,6 @@ ns_send_appdefined (int value) waitUntilDone:YES]; return; } -#endif /* Only post this event if we haven't already posted one. This will end the [NXApp run] main loop after having processed all events queued at @@ -5542,12 +5541,10 @@ not_in_argv (NSString *arg) ns_send_appdefined (-2); } -#ifdef NS_IMPL_GNUSTEP - (void)sendFromMainThread:(id)unused { ns_send_appdefined (nextappdefined); } -#endif - (void)fd_handler:(id)unused /* -------------------------------------------------------------------------- |