aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPhilipp Stephani2017-05-20 16:56:38 +0200
committerPhilipp Stephani2017-05-21 21:50:30 +0200
commitfa389f5b54aedab0b4cc5f8fb6f558e55b27d55d (patch)
tree51a79bf52382624e38860bbacde7972bbb291d5b /src
parent6dd94bcc6b44ee06917d76d638120eca2cf59377 (diff)
downloademacs-fa389f5b54aedab0b4cc5f8fb6f558e55b27d55d.tar.gz
emacs-fa389f5b54aedab0b4cc5f8fb6f558e55b27d55d.zip
Fix call of registerServicesMenuSendTypes
* src/nsterm.m (initFrameFromEmacs:): nil is not allowed for returnTypes; pass an empty array instead.
Diffstat (limited to 'src')
-rw-r--r--src/nsterm.m2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nsterm.m b/src/nsterm.m
index 6e138b7eb6c..c8320130a87 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -7022,7 +7022,7 @@ not_in_argv (NSString *arg)
7022 [self allocateGState]; 7022 [self allocateGState];
7023#endif 7023#endif
7024 [NSApp registerServicesMenuSendTypes: ns_send_types 7024 [NSApp registerServicesMenuSendTypes: ns_send_types
7025 returnTypes: nil]; 7025 returnTypes: [NSArray array]];
7026 7026
7027 /* macOS Sierra automatically enables tabbed windows. We can't 7027 /* macOS Sierra automatically enables tabbed windows. We can't
7028 allow this to be enabled until it's available on a Free system. 7028 allow this to be enabled until it's available on a Free system.