Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
patch 8.1.0063: Mac: NSStringPboardType is deprecated
Problem: Mac: NSStringPboardType is deprecated.
Solution: Use NSPasteboardTypeString. (Akshay Hegde, closes #3022)
- Loading branch information
Showing
with
23 additions
and
2 deletions.
-
+21
−2
src/os_macosx.m
-
+2
−0
src/version.c
|
@@ -63,8 +63,13 @@ |
|
|
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; |
|
|
|
|
|
NSPasteboard *pb = [NSPasteboard generalPasteboard]; |
|
|
#ifdef AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER |
|
|
NSArray *supportedTypes = [NSArray arrayWithObjects:VimPboardType, |
|
|
NSPasteboardTypeString, nil]; |
|
|
#else |
|
|
NSArray *supportedTypes = [NSArray arrayWithObjects:VimPboardType, |
|
|
NSStringPboardType, nil]; |
|
|
#endif |
|
|
NSString *bestType = [pb availableTypeFromArray:supportedTypes]; |
|
|
if (!bestType) goto releasepool; |
|
|
|
|
@@ -76,7 +81,7 @@ |
|
|
/* This type should consist of an array with two objects: |
|
|
* 1. motion type (NSNumber) |
|
|
* 2. text (NSString) |
|
|
* If this is not the case we fall back on using NSStringPboardType. |
|
|
* If this is not the case we fall back on using NSPasteboardTypeString. |
|
|
*/ |
|
|
id plist = [pb propertyListForType:VimPboardType]; |
|
|
if ([plist isKindOfClass:[NSArray class]] && [plist count] == 2) |
|
@@ -92,10 +97,15 @@ |
|
|
|
|
|
if (!string) |
|
|
{ |
|
|
/* Use NSStringPboardType. The motion type is detected automatically. |
|
|
/* Use NSPasteboardTypeString. The motion type is detected automatically. |
|
|
*/ |
|
|
#ifdef AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER |
|
|
NSMutableString *mstring = |
|
|
[[pb stringForType:NSPasteboardTypeString] mutableCopy]; |
|
|
#else |
|
|
NSMutableString *mstring = |
|
|
[[pb stringForType:NSStringPboardType] mutableCopy]; |
|
|
#endif |
|
|
if (!mstring) goto releasepool; |
|
|
|
|
|
/* Replace unrecognized end-of-line sequences with \x0a (line feed). */ |
|
@@ -178,15 +188,24 @@ |
|
|
|
|
|
/* See clip_mch_request_selection() for info on pasteboard types. */ |
|
|
NSPasteboard *pb = [NSPasteboard generalPasteboard]; |
|
|
#ifdef AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER |
|
|
NSArray *supportedTypes = [NSArray arrayWithObjects:VimPboardType, |
|
|
NSPasteboardTypeString, nil]; |
|
|
#else |
|
|
NSArray *supportedTypes = [NSArray arrayWithObjects:VimPboardType, |
|
|
NSStringPboardType, nil]; |
|
|
#endif |
|
|
[pb declareTypes:supportedTypes owner:nil]; |
|
|
|
|
|
NSNumber *motion = [NSNumber numberWithInt:motion_type]; |
|
|
NSArray *plist = [NSArray arrayWithObjects:motion, string, nil]; |
|
|
[pb setPropertyList:plist forType:VimPboardType]; |
|
|
|
|
|
#ifdef AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER |
|
|
[pb setString:string forType:NSPasteboardTypeString]; |
|
|
#else |
|
|
[pb setString:string forType:NSStringPboardType]; |
|
|
#endif |
|
|
|
|
|
[string release]; |
|
|
} |
|
|
|
@@ -761,6 +761,8 @@ static char *(features[]) = |
|
|
|
|
|
static int included_patches[] = |
|
|
{ /* Add new patch number below this line */ |
|
|
/**/ |
|
|
63, |
|
|
/**/ |
|
|
62, |
|
|
/**/ |
|
|