Merge from trunk.

[gnu-emacs] / src / nsterm.m

diff --git a/src/nsterm.m b/src/nsterm.m
index b724b6a02f3e7ade60d315cfc437d30d7369aafc..546247ab74ac817dc39d35cbcc6c7a3f3d700f03 100644 (file)
--- 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;