mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-17 17:58:46 +00:00
Code Issues Releases Activity

Fix breakage introduced by fixing Bug#8842.

Browse Source 
* 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.
This commit is contained in:
Jan Djärv 2011-07-08 17:39:40 +02:00
parent 856b2f11d8
commit 3fe4b54936
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ChangeLog
View File

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

3
src/nsfns.m
View File

@ -1729,7 +1729,8 @@ and GNUstep implementations ("distributor-specific release
/* 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,

5
src/nsterm.m
View File

@ -5370,7 +5370,7 @@ - (BOOL)isOpaque
[self allocateGState];
[NSApp registerServicesMenuSendTypes: ns_send_types
returnTypes: ns_return_types];
returnTypes: nil];
ns_window_num++;
return self;
@ -5748,8 +5748,7 @@ - (id) validRequestorForSendType: (NSString *)typeSent
{
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;