From: Daniel Martín Date: Fri, 18 Sep 2020 11:36:47 +0000 (+0200) Subject: Use modern constant names for the NS pasteboard X-Git-Tag: emacs-27.1.90~150 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3223302aa2294d0e2a68216e84e3ee2d4ebcbee1;p=emacs.git 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 --- diff --git a/src/nsterm.m b/src/nsterm.m index ac467840a25..3dd915e3703 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -8363,7 +8363,7 @@ not_in_argv (NSString *arg) while ( (file = [fenum nextObject]) ) strings = Fcons (build_string ([file UTF8String]), strings); } - else if ([type isEqualToString: NSURLPboardType]) + else if ([type isEqualToString: NSPasteboardTypeURL]) { NSURL *url = [NSURL URLFromPasteboard: pb]; if (url == nil) return NO; @@ -8372,8 +8372,8 @@ not_in_argv (NSString *arg) strings = list1 (build_string ([[url absoluteString] UTF8String])); } - else if ([type isEqualToString: NSStringPboardType] - || [type isEqualToString: NSTabularTextPboardType]) + else if ([type isEqualToString: NSPasteboardTypeString] + || [type isEqualToString: NSPasteboardTypeTabularText]) { NSString *data;