From: Jan Djärv <jan.h.d@swipnet.se>
Date: Fri, 8 Jul 2011 15:39:40 +0000 (+0200)
Subject: Fix breakage introduced by fixing Bug#8842.
X-Git-Tag: emacs-pretest-24.0.90~104^2~423
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3fe4b54936ae48b8d30458bb9cac2912a9ecc09a;p=emacs.git

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.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index c48956042a1..ff7382a87e4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2011-07-08  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* nsterm.m (initFrameFromEmacs): Don't use ns_return_types
+	in registerServicesMenuSendTypes.
+	(validRequestorForSendType): Don't check ns_return_types.
+
+	* nsfns.m (Fx_open_connection): Put NSStringPboardType into
+	ns_return_type.
+
 2011-07-08  Jason Rumney  <jasonr@gnu.org>
 
 	* w32fns.c (w32_wnd_proc) [WM_TIMER, WM_SET_CURSOR]: Avoid using
diff --git a/src/nsfns.m b/src/nsfns.m
index 865fc0da9cb..0452086201e 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -1729,7 +1729,8 @@ terminate Emacs if we can't open the connection.
   /* Register our external input/output types, used for determining
      applicable services and also drag/drop eligibility. */
   ns_send_types = [[NSArray arrayWithObjects: NSStringPboardType, nil] retain];
-  ns_return_types = [[NSArray arrayWithObjects: nil] retain];
+  ns_return_types = [[NSArray arrayWithObjects: NSStringPboardType, nil]
+                      retain];
   ns_drag_types = [[NSArray arrayWithObjects:
                             NSStringPboardType,
                             NSTabularTextPboardType,
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;