diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2011-07-08 17:39:40 +0200 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2011-07-08 17:39:40 +0200 |
| commit | 3fe4b54936ae48b8d30458bb9cac2912a9ecc09a (patch) | |
| tree | 09f07136128e0a25f2681929dc527ea5aeb92c3a /src/nsterm.m | |
| parent | 856b2f11d8373374d9ddf7e89f6512b39e4071e3 (diff) | |
| download | emacs-3fe4b54936ae48b8d30458bb9cac2912a9ecc09a.tar.gz | |
Fix breakage introduced by fixing Bug#8842.
* nsfns.m (Fx_open_connection): Put NSStringPboardType into
ns_return_type.
* nsterm.m (initFrameFromEmacs): Don't use ns_return_types
in registerServicesMenuSendTypes.
(validRequestorForSendType): Don't check ns_return_types.
Diffstat (limited to 'src/nsterm.m')
| -rw-r--r-- | src/nsterm.m | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/nsterm.m b/src/nsterm.m index b724b6a02f3..546247ab74a 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -5370,7 +5370,7 @@ ns_term_shutdown (int sig) [self allocateGState]; [NSApp registerServicesMenuSendTypes: ns_send_types - returnTypes: ns_return_types]; + returnTypes: nil]; ns_window_num++; return self; @@ -5748,8 +5748,7 @@ ns_term_shutdown (int sig) { NSTRACE (validRequestorForSendType); if (typeSent != nil && [ns_send_types indexOfObject: typeSent] != NSNotFound - && (typeReturned == nil - || [ns_return_types indexOfObject: typeSent] != NSNotFound)) + && typeReturned == nil) { if (! NILP (ns_get_local_selection (QPRIMARY, QUTF8_STRING))) return self; |