[Emacs-diffs] /srv/bzr/emacs/trunk r105043: Fix breakage introduced by fixing Bug#8842.

[Jan D.]

------------------------------------------------------------
revno: 105043
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Fri 2011-07-08 17:39:40 +0200
message:
  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.
modified:
  src/ChangeLog
  src/nsfns.m
  src/nsterm.m

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-07-08 12:46:17 +0000
+++ b/src/ChangeLog     2011-07-08 15:39:40 +0000
@@ -1,3 +1,12 @@
+2011-07-08  Jan Djärv  <address@hidden>
+
+       * 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  <address@hidden>
 
        * w32fns.c (w32_wnd_proc) [WM_TIMER, WM_SET_CURSOR]: Avoid using

=== modified file 'src/nsfns.m'
--- a/src/nsfns.m       2011-07-08 10:04:23 +0000
+++ b/src/nsfns.m       2011-07-08 15:39:40 +0000
@@ -1729,7 +1729,8 @@
   /* 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,

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2011-07-08 10:04:23 +0000
+++ b/src/nsterm.m      2011-07-08 15:39:40 +0000
@@ -5370,7 +5370,7 @@
   [self allocateGState];
 
   [NSApp registerServicesMenuSendTypes: ns_send_types
-                           returnTypes: ns_return_types];
+                           returnTypes: nil];
 
   ns_window_num++;
   return self;
@@ -5748,8 +5748,7 @@
 {
   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;