projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| a2e11672 AG |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.227 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.3.227 (after 7.3.221) | |
| 11 | Problem: Mac OS doesn't have the linewise clipboard fix. | |
| 12 | Solution: Also change the Mac OS file. (Bjorn Winckler) | |
| 13 | Files: src/os_macosx.m | |
| 14 | ||
| 15 | ||
| 16 | *** ../mercurial/vim73/src/os_macosx.m 2011-06-13 02:03:55.000000000 +0200 | |
| 17 | --- src/os_macosx.m 2011-06-20 00:23:57.000000000 +0200 | |
| 18 | *************** | |
| 19 | *** 65,71 **** | |
| 20 | NSString *bestType = [pb availableTypeFromArray:supportedTypes]; | |
| 21 | if (!bestType) goto releasepool; | |
| 22 | ||
| 23 | ! int motion_type = MCHAR; | |
| 24 | NSString *string = nil; | |
| 25 | ||
| 26 | if ([bestType isEqual:VimPboardType]) | |
| 27 | --- 65,71 ---- | |
| 28 | NSString *bestType = [pb availableTypeFromArray:supportedTypes]; | |
| 29 | if (!bestType) goto releasepool; | |
| 30 | ||
| 31 | ! int motion_type = MAUTO; | |
| 32 | NSString *string = nil; | |
| 33 | ||
| 34 | if ([bestType isEqual:VimPboardType]) | |
| 35 | *************** | |
| 36 | *** 89,97 **** | |
| 37 | ||
| 38 | if (!string) | |
| 39 | { | |
| 40 | ! /* Use NSStringPboardType. The motion type is set to line-wise if the | |
| 41 | ! * string contains at least one EOL character, otherwise it is set to | |
| 42 | ! * character-wise (block-wise is never used). | |
| 43 | */ | |
| 44 | NSMutableString *mstring = | |
| 45 | [[pb stringForType:NSStringPboardType] mutableCopy]; | |
| 46 | --- 89,95 ---- | |
| 47 | ||
| 48 | if (!string) | |
| 49 | { | |
| 50 | ! /* Use NSStringPboardType. The motion type is detected automatically. | |
| 51 | */ | |
| 52 | NSMutableString *mstring = | |
| 53 | [[pb stringForType:NSStringPboardType] mutableCopy]; | |
| 54 | *************** | |
| 55 | *** 108,126 **** | |
| 56 | options:0 range:range]; | |
| 57 | } | |
| 58 | ||
| 59 | - /* Scan for newline character to decide whether the string should be | |
| 60 | - * pasted line-wise or character-wise. | |
| 61 | - */ | |
| 62 | - motion_type = MCHAR; | |
| 63 | - if (0 < n || NSNotFound != [mstring rangeOfString:@"\n"].location) | |
| 64 | - motion_type = MLINE; | |
| 65 | - | |
| 66 | string = mstring; | |
| 67 | } | |
| 68 | ||
| 69 | if (!(MCHAR == motion_type || MLINE == motion_type || MBLOCK == motion_type | |
| 70 | || MAUTO == motion_type)) | |
| 71 | ! motion_type = MCHAR; | |
| 72 | ||
| 73 | char_u *str = (char_u*)[string UTF8String]; | |
| 74 | int len = [string lengthOfBytesUsingEncoding:NSUTF8StringEncoding]; | |
| 75 | --- 106,118 ---- | |
| 76 | options:0 range:range]; | |
| 77 | } | |
| 78 | ||
| 79 | string = mstring; | |
| 80 | } | |
| 81 | ||
| 82 | + /* Default to MAUTO, uses MCHAR or MLINE depending on trailing NL. */ | |
| 83 | if (!(MCHAR == motion_type || MLINE == motion_type || MBLOCK == motion_type | |
| 84 | || MAUTO == motion_type)) | |
| 85 | ! motion_type = MAUTO; | |
| 86 | ||
| 87 | char_u *str = (char_u*)[string UTF8String]; | |
| 88 | int len = [string lengthOfBytesUsingEncoding:NSUTF8StringEncoding]; | |
| 89 | *** ../vim-7.3.226/src/version.c 2011-06-19 04:54:17.000000000 +0200 | |
| 90 | --- src/version.c 2011-06-20 00:21:53.000000000 +0200 | |
| 91 | *************** | |
| 92 | *** 711,712 **** | |
| 93 | --- 711,714 ---- | |
| 94 | { /* Add new patch number below this line */ | |
| 95 | + /**/ | |
| 96 | + 227, | |
| 97 | /**/ | |
| 98 | ||
| 99 | -- | |
| 100 | Some of the well know MS-Windows errors: | |
| 101 | EMULTI Multitasking attempted, system confused | |
| 102 | EKEYBOARD Keyboard locked, try getting out of this one! | |
| 103 | EXPLAIN Unexplained error, please tell us what happened | |
| 104 | EFUTURE Reserved for our future mistakes | |
| 105 | ||
| 106 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 107 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 108 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 109 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |