diff options
| author | Daniel MartÃn | 2020-09-18 13:36:47 +0200 |
|---|---|---|
| committer | Alan Third | 2020-09-18 20:06:36 +0100 |
| commit | 3223302aa2294d0e2a68216e84e3ee2d4ebcbee1 (patch) | |
| tree | d86c6da5767284035d51447f3185342bca1dc8f6 /src | |
| parent | 985703d3800fb48feec44e3fd7880e9561bcbdc7 (diff) | |
| download | emacs-3223302aa2294d0e2a68216e84e3ee2d4ebcbee1.tar.gz emacs-3223302aa2294d0e2a68216e84e3ee2d4ebcbee1.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/nsterm.m | 6 |
1 files changed, 3 insertions, 3 deletions
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) | |||
| 8363 | while ( (file = [fenum nextObject]) ) | 8363 | while ( (file = [fenum nextObject]) ) |
| 8364 | strings = Fcons (build_string ([file UTF8String]), strings); | 8364 | strings = Fcons (build_string ([file UTF8String]), strings); |
| 8365 | } | 8365 | } |
| 8366 | else if ([type isEqualToString: NSURLPboardType]) | 8366 | else if ([type isEqualToString: NSPasteboardTypeURL]) |
| 8367 | { | 8367 | { |
| 8368 | NSURL *url = [NSURL URLFromPasteboard: pb]; | 8368 | NSURL *url = [NSURL URLFromPasteboard: pb]; |
| 8369 | if (url == nil) return NO; | 8369 | if (url == nil) return NO; |
| @@ -8372,8 +8372,8 @@ not_in_argv (NSString *arg) | |||
| 8372 | 8372 | ||
| 8373 | strings = list1 (build_string ([[url absoluteString] UTF8String])); | 8373 | strings = list1 (build_string ([[url absoluteString] UTF8String])); |
| 8374 | } | 8374 | } |
| 8375 | else if ([type isEqualToString: NSStringPboardType] | 8375 | else if ([type isEqualToString: NSPasteboardTypeString] |
| 8376 | || [type isEqualToString: NSTabularTextPboardType]) | 8376 | || [type isEqualToString: NSPasteboardTypeTabularText]) |
| 8377 | { | 8377 | { |
| 8378 | NSString *data; | 8378 | NSString *data; |
| 8379 | 8379 | ||