diff options
| author | Mattias Engdegård <mattiase@acm.org> | 2021-01-10 17:05:18 +0100 |
|---|---|---|
| committer | Mattias Engdegård <mattiase@acm.org> | 2021-01-18 12:52:08 +0100 |
| commit | 36d33776c21b3765b8a611f09ae7d86417abee8a (patch) | |
| tree | d7ad363db5ed0fff1610e60d89a808c05402fc4f /src/nsselect.m | |
| parent | 3b4050154e3f72c06501cd9a5ad83841b92c7bd6 (diff) | |
| download | emacs-36d33776c21b3765b8a611f09ae7d86417abee8a.tar.gz | |
Avoid macOS NSFilenamesPboardType warning (bug#33035)
* src/nsterm.h (NS_USE_NSPasteboardTypeFileURL): New #define.
* src/nsterm.m (ns_term_init):
([EmacsView performDragOperation:]):
* src/nsselect.m (ns_string_to_symbol):
(nxatoms_of_nsselect):
NSFilenamesPboardType was deprecated in macOS 10.14; use
NSPasteboardTypeFileURL instead when available.
Diffstat (limited to 'src/nsselect.m')
| -rw-r--r-- | src/nsselect.m | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/nsselect.m b/src/nsselect.m index 27db9248e46..5ab3ef77fec 100644 --- a/src/nsselect.m +++ b/src/nsselect.m @@ -78,7 +78,13 @@ ns_string_to_symbol (NSString *t) return QSECONDARY; if ([t isEqualToString: NSPasteboardTypeString]) return QTEXT; - if ([t isEqualToString: NSFilenamesPboardType]) + if ([t isEqualToString: +#if NS_USE_NSPasteboardTypeFileURL != 0 + NSPasteboardTypeFileURL +#else + NSFilenamesPboardType +#endif + ]) return QFILE_NAME; if ([t isEqualToString: NSPasteboardTypeTabularText]) return QTEXT; @@ -467,7 +473,12 @@ nxatoms_of_nsselect (void) [NSNumber numberWithLong:0], NXPrimaryPboard, [NSNumber numberWithLong:0], NXSecondaryPboard, [NSNumber numberWithLong:0], NSPasteboardTypeString, - [NSNumber numberWithLong:0], NSFilenamesPboardType, + [NSNumber numberWithLong:0], +#if NS_USE_NSPasteboardTypeFileURL != 0 + NSPasteboardTypeFileURL, +#else + NSFilenamesPboardType, +#endif [NSNumber numberWithLong:0], NSPasteboardTypeTabularText, nil] retain]; } |