1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-15 09:47:20 +00:00

Use modern constant names for the NS pasteboard

Use the same pasteboard constant names defined in
ns_drag_types. (Bug#43470).

* src/nsterm.m: Rename NSURLPboardType to NSPasteboardTypeURL,
NSStringPboardType to NSPasteboardTypeString, and
NSTabularTextPboardType to NSPasteboardTypeTabularText
This commit is contained in:
Daniel Martín 2020-09-18 13:36:47 +02:00 committed by Alan Third
parent 985703d380
commit 3223302aa2

View File

@ -8363,7 +8363,7 @@ -(BOOL)performDragOperation: (id <NSDraggingInfo>) sender
while ( (file = [fenum nextObject]) ) while ( (file = [fenum nextObject]) )
strings = Fcons (build_string ([file UTF8String]), strings); strings = Fcons (build_string ([file UTF8String]), strings);
} }
else if ([type isEqualToString: NSURLPboardType]) else if ([type isEqualToString: NSPasteboardTypeURL])
{ {
NSURL *url = [NSURL URLFromPasteboard: pb]; NSURL *url = [NSURL URLFromPasteboard: pb];
if (url == nil) return NO; if (url == nil) return NO;
@ -8372,8 +8372,8 @@ -(BOOL)performDragOperation: (id <NSDraggingInfo>) sender
strings = list1 (build_string ([[url absoluteString] UTF8String])); strings = list1 (build_string ([[url absoluteString] UTF8String]));
} }
else if ([type isEqualToString: NSStringPboardType] else if ([type isEqualToString: NSPasteboardTypeString]
|| [type isEqualToString: NSTabularTextPboardType]) || [type isEqualToString: NSPasteboardTypeTabularText])
{ {
NSString *data; NSString *data;