aboutsummaryrefslogtreecommitdiffstats
path: root/src/nsselect.m
diff options
context:
space:
mode:
authorAlan Third2017-12-10 20:15:52 +0000
committerAlan Third2017-12-16 16:35:46 +0000
commit95e7195f0d2a30beb2aaa0c324dd6049a168ba5b (patch)
tree1a914601410a688511b1112cb16f18fda575d7a0 /src/nsselect.m
parentf63d9f86b5688ac84ec6e7eecdbb6cac103dbcf2 (diff)
downloademacs-95e7195f0d2a30beb2aaa0c324dd6049a168ba5b.tar.gz
emacs-95e7195f0d2a30beb2aaa0c324dd6049a168ba5b.zip
Silence macOS 10.13 deprecation notices (Bug#29643)
* src/nsfns.m (Fx_display_backing_store): (Fx_display_save_under): Don't use NSBackingStoreRetained or NSBackingStoreNonretained on macOS 10.13+. * src/nsselect.m (symbol_to_nsstring): (ns_string_to_symbol): (nxatoms_of_nsselect): Replace NSGeneralPboard with NSPasteboardNameGeneral. * src/nsterm.h: #define NSPasteboardNameGeneral to NSGeneralPboard on GNUstep and macOS < 10.13. * src/nsterm.m (EmacsView::resetCursorRects): (EmacsScroller::resetCursorRects): Don't use setOnMouseEntered on macOS 10.13+.
Diffstat (limited to 'src/nsselect.m')
-rw-r--r--src/nsselect.m8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nsselect.m b/src/nsselect.m
index 067c7788e8b..d1ce9437a73 100644
--- a/src/nsselect.m
+++ b/src/nsselect.m
@@ -36,7 +36,7 @@ GNUstep port and post-20 update by Adrian Robert (arobert@cogsci.ucsd.edu)
36 36
37static Lisp_Object Vselection_alist; 37static Lisp_Object Vselection_alist;
38 38
39/* NSGeneralPboard is pretty much analogous to X11 CLIPBOARD */ 39/* NSPasteboardNameGeneral is pretty much analogous to X11 CLIPBOARD */
40static NSString *NXPrimaryPboard; 40static NSString *NXPrimaryPboard;
41static NSString *NXSecondaryPboard; 41static NSString *NXSecondaryPboard;
42 42
@@ -54,7 +54,7 @@ static NSString *
54symbol_to_nsstring (Lisp_Object sym) 54symbol_to_nsstring (Lisp_Object sym)
55{ 55{
56 CHECK_SYMBOL (sym); 56 CHECK_SYMBOL (sym);
57 if (EQ (sym, QCLIPBOARD)) return NSGeneralPboard; 57 if (EQ (sym, QCLIPBOARD)) return NSPasteboardNameGeneral;
58 if (EQ (sym, QPRIMARY)) return NXPrimaryPboard; 58 if (EQ (sym, QPRIMARY)) return NXPrimaryPboard;
59 if (EQ (sym, QSECONDARY)) return NXSecondaryPboard; 59 if (EQ (sym, QSECONDARY)) return NXSecondaryPboard;
60 if (EQ (sym, QTEXT)) return NSStringPboardType; 60 if (EQ (sym, QTEXT)) return NSStringPboardType;
@@ -70,7 +70,7 @@ ns_symbol_to_pb (Lisp_Object symbol)
70static Lisp_Object 70static Lisp_Object
71ns_string_to_symbol (NSString *t) 71ns_string_to_symbol (NSString *t)
72{ 72{
73 if ([t isEqualToString: NSGeneralPboard]) 73 if ([t isEqualToString: NSPasteboardNameGeneral])
74 return QCLIPBOARD; 74 return QCLIPBOARD;
75 if ([t isEqualToString: NXPrimaryPboard]) 75 if ([t isEqualToString: NXPrimaryPboard])
76 return QPRIMARY; 76 return QPRIMARY;
@@ -469,7 +469,7 @@ nxatoms_of_nsselect (void)
469 pasteboard_changecount 469 pasteboard_changecount
470 = [[NSMutableDictionary 470 = [[NSMutableDictionary
471 dictionaryWithObjectsAndKeys: 471 dictionaryWithObjectsAndKeys:
472 [NSNumber numberWithLong:0], NSGeneralPboard, 472 [NSNumber numberWithLong:0], NSPasteboardNameGeneral,
473 [NSNumber numberWithLong:0], NXPrimaryPboard, 473 [NSNumber numberWithLong:0], NXPrimaryPboard,
474 [NSNumber numberWithLong:0], NXSecondaryPboard, 474 [NSNumber numberWithLong:0], NXSecondaryPboard,
475 [NSNumber numberWithLong:0], NSStringPboardType, 475 [NSNumber numberWithLong:0], NSStringPboardType,