1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
|
To: vim_dev@googlegroups.com
Subject: Patch 8.1.0063
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 8.1.0063
Problem: Mac: NSStringPboardType is deprecated.
Solution: Use NSPasteboardTypeString. (Akshay Hegde, closes #3022)
Files: src/os_macosx.m
*** ../vim-8.1.0062/src/os_macosx.m 2018-03-06 17:53:40.000000000 +0100
--- src/os_macosx.m 2018-06-17 15:00:15.344692977 +0200
***************
*** 63,70 ****
--- 63,75 ----
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,82 ****
/* 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.
*/
id plist = [pb propertyListForType:VimPboardType];
if ([plist isKindOfClass:[NSArray class]] && [plist count] == 2)
--- 81,87 ----
/* 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 NSPasteboardTypeString.
*/
id plist = [pb propertyListForType:VimPboardType];
if ([plist isKindOfClass:[NSArray class]] && [plist count] == 2)
***************
*** 92,101 ****
if (!string)
{
! /* Use NSStringPboardType. The motion type is detected automatically.
*/
NSMutableString *mstring =
[[pb stringForType:NSStringPboardType] mutableCopy];
if (!mstring) goto releasepool;
/* Replace unrecognized end-of-line sequences with \x0a (line feed). */
--- 97,111 ----
if (!string)
{
! /* 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,192 ****
--- 188,211 ----
/* 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];
}
*** ../vim-8.1.0062/src/version.c 2018-06-17 14:47:50.657309005 +0200
--- src/version.c 2018-06-17 15:00:06.472745233 +0200
***************
*** 763,764 ****
--- 763,766 ----
{ /* Add new patch number below this line */
+ /**/
+ 63,
/**/
--
Q: Should I clean my house or work on Vim?
A: Whatever contains more bugs.
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|
