projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| bb987377 ER |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.179 | |
| 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.179 | |
| 11 | Problem: C-indent doesn't handle colon in string correctly. | |
| 12 | Solution: Skip the string. (Lech Lorens) | |
| 13 | Files: src/misc1.c, src/testdir/test3.in, src/testdir/test3.ok | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.3.178/src/misc1.c 2011-05-10 11:39:13.000000000 +0200 | |
| 17 | --- src/misc1.c 2011-05-10 11:50:14.000000000 +0200 | |
| 18 | *************** | |
| 19 | *** 5801,5807 **** | |
| 20 | continue; | |
| 21 | } | |
| 22 | ||
| 23 | ! if (s[0] == ':') | |
| 24 | { | |
| 25 | if (s[1] == ':') | |
| 26 | { | |
| 27 | --- 5801,5809 ---- | |
| 28 | continue; | |
| 29 | } | |
| 30 | ||
| 31 | ! if (s[0] == '"') | |
| 32 | ! s = skip_string(s) + 1; | |
| 33 | ! else if (s[0] == ':') | |
| 34 | { | |
| 35 | if (s[1] == ':') | |
| 36 | { | |
| 37 | *** ../vim-7.3.178/src/testdir/test3.in 2011-05-10 11:39:13.000000000 +0200 | |
| 38 | --- src/testdir/test3.in 2011-05-10 11:53:02.000000000 +0200 | |
| 39 | *************** | |
| 40 | *** 1360,1365 **** | |
| 41 | --- 1360,1378 ---- | |
| 42 | } | |
| 43 | ||
| 44 | STARTTEST | |
| 45 | + :set cino& | |
| 46 | + 2kdd=][ | |
| 47 | + ENDTEST | |
| 48 | + | |
| 49 | + void func(void) | |
| 50 | + { | |
| 51 | + cout << "a" | |
| 52 | + << "b" | |
| 53 | + << ") :" | |
| 54 | + << "c"; | |
| 55 | + } | |
| 56 | + | |
| 57 | + STARTTEST | |
| 58 | :g/^STARTTEST/.,/^ENDTEST/d | |
| 59 | :1;/start of AUTO/,$wq! test.out | |
| 60 | ENDTEST | |
| 61 | *** ../vim-7.3.178/src/testdir/test3.ok 2011-05-10 11:39:13.000000000 +0200 | |
| 62 | --- src/testdir/test3.ok 2011-05-10 11:50:14.000000000 +0200 | |
| 63 | *************** | |
| 64 | *** 1216,1218 **** | |
| 65 | --- 1216,1227 ---- | |
| 66 | printf("Foo!\n"); | |
| 67 | } | |
| 68 | ||
| 69 | + | |
| 70 | + void func(void) | |
| 71 | + { | |
| 72 | + cout << "a" | |
| 73 | + << "b" | |
| 74 | + << ") :" | |
| 75 | + << "c"; | |
| 76 | + } | |
| 77 | + | |
| 78 | *** ../vim-7.3.178/src/version.c 2011-05-10 11:39:13.000000000 +0200 | |
| 79 | --- src/version.c 2011-05-10 11:53:36.000000000 +0200 | |
| 80 | *************** | |
| 81 | *** 716,717 **** | |
| 82 | --- 716,719 ---- | |
| 83 | { /* Add new patch number below this line */ | |
| 84 | + /**/ | |
| 85 | + 179, | |
| 86 | /**/ | |
| 87 | ||
| 88 | -- | |
| 89 | hundred-and-one symptoms of being an internet addict: | |
| 90 | 71. You wonder how people walk | |
| 91 | ||
| 92 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 93 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 94 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 95 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |