Mercurial > vim
changeset 2909:b65a26a2aa09 v7.3.227
updated for version 7.3.227
Problem: Mac OS doesn't have the linewise clipboard fix.
Solution: Also change the Mac OS file. (Bjorn Winckler)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Mon, 20 Jun 2011 00:25:44 +0200 |
| parents | fd09a9c8468e |
| children | a60195a05884 |
| files | src/os_macosx.m src/version.c |
| diffstat | 2 files changed, 6 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/os_macosx.m +++ b/src/os_macosx.m @@ -65,7 +65,7 @@ clip_mch_request_selection(VimClipboard NSString *bestType = [pb availableTypeFromArray:supportedTypes]; if (!bestType) goto releasepool; - int motion_type = MCHAR; + int motion_type = MAUTO; NSString *string = nil; if ([bestType isEqual:VimPboardType]) @@ -89,9 +89,7 @@ clip_mch_request_selection(VimClipboard if (!string) { - /* Use NSStringPboardType. The motion type is set to line-wise if the - * string contains at least one EOL character, otherwise it is set to - * character-wise (block-wise is never used). + /* Use NSStringPboardType. The motion type is detected automatically. */ NSMutableString *mstring = [[pb stringForType:NSStringPboardType] mutableCopy]; @@ -108,19 +106,13 @@ clip_mch_request_selection(VimClipboard options:0 range:range]; } - /* Scan for newline character to decide whether the string should be - * pasted line-wise or character-wise. - */ - motion_type = MCHAR; - if (0 < n || NSNotFound != [mstring rangeOfString:@"\n"].location) - motion_type = MLINE; - string = mstring; } + /* Default to MAUTO, uses MCHAR or MLINE depending on trailing NL. */ if (!(MCHAR == motion_type || MLINE == motion_type || MBLOCK == motion_type || MAUTO == motion_type)) - motion_type = MCHAR; + motion_type = MAUTO; char_u *str = (char_u*)[string UTF8String]; int len = [string lengthOfBytesUsingEncoding:NSUTF8StringEncoding];