projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| d034a75d AG |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.379 | |
| 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.379 | |
| 11 | Problem: C-indenting wrong for static enum. | |
| 12 | Solution: Skip over "static". (Lech Lorens) | |
| 13 | Files: src/misc1.c, src/testdir/test3.in, src/testdir/test3.ok | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.3.378/src/misc1.c 2011-11-30 17:20:18.000000000 +0100 | |
| 17 | --- src/misc1.c 2011-12-14 19:37:48.000000000 +0100 | |
| 18 | *************** | |
| 19 | *** 5138,5143 **** | |
| 20 | --- 5138,5146 ---- | |
| 21 | if (STRNCMP(s, "typedef", 7) == 0 && !vim_isIDc(s[7])) | |
| 22 | s = cin_skipcomment(s + 7); | |
| 23 | ||
| 24 | + if (STRNCMP(s, "static", 6) == 0 && !vim_isIDc(s[6])) | |
| 25 | + s = cin_skipcomment(s + 6); | |
| 26 | + | |
| 27 | if (STRNCMP(s, "enum", 4) == 0 && !vim_isIDc(s[4])) | |
| 28 | return TRUE; | |
| 29 | ||
| 30 | *** ../vim-7.3.378/src/testdir/test3.in 2011-11-30 17:20:18.000000000 +0100 | |
| 31 | --- src/testdir/test3.in 2011-12-14 20:03:11.000000000 +0100 | |
| 32 | *************** | |
| 33 | *** 299,316 **** | |
| 34 | ||
| 35 | enum soppie | |
| 36 | { | |
| 37 | ! yes = 0, | |
| 38 | ! no, | |
| 39 | ! maybe | |
| 40 | }; | |
| 41 | ||
| 42 | typedef enum soppie | |
| 43 | { | |
| 44 | ! yes = 0, | |
| 45 | ! no, | |
| 46 | ! maybe | |
| 47 | }; | |
| 48 | ||
| 49 | { | |
| 50 | int a, | |
| 51 | b; | |
| 52 | --- 299,323 ---- | |
| 53 | ||
| 54 | enum soppie | |
| 55 | { | |
| 56 | ! yes = 0, | |
| 57 | ! no, | |
| 58 | ! maybe | |
| 59 | }; | |
| 60 | ||
| 61 | typedef enum soppie | |
| 62 | { | |
| 63 | ! yes = 0, | |
| 64 | ! no, | |
| 65 | ! maybe | |
| 66 | }; | |
| 67 | ||
| 68 | + static enum | |
| 69 | + { | |
| 70 | + yes = 0, | |
| 71 | + no, | |
| 72 | + maybe | |
| 73 | + } soppie; | |
| 74 | + | |
| 75 | { | |
| 76 | int a, | |
| 77 | b; | |
| 78 | *** ../vim-7.3.378/src/testdir/test3.ok 2011-11-30 17:20:18.000000000 +0100 | |
| 79 | --- src/testdir/test3.ok 2011-12-14 19:37:48.000000000 +0100 | |
| 80 | *************** | |
| 81 | *** 299,304 **** | |
| 82 | --- 299,311 ---- | |
| 83 | maybe | |
| 84 | }; | |
| 85 | ||
| 86 | + static enum | |
| 87 | + { | |
| 88 | + yes = 0, | |
| 89 | + no, | |
| 90 | + maybe | |
| 91 | + } soppie; | |
| 92 | + | |
| 93 | { | |
| 94 | int a, | |
| 95 | b; | |
| 96 | *** ../vim-7.3.378/src/version.c 2011-12-14 19:22:29.000000000 +0100 | |
| 97 | --- src/version.c 2011-12-14 20:02:19.000000000 +0100 | |
| 98 | *************** | |
| 99 | *** 716,717 **** | |
| 100 | --- 716,719 ---- | |
| 101 | { /* Add new patch number below this line */ | |
| 102 | + /**/ | |
| 103 | + 379, | |
| 104 | /**/ | |
| 105 | ||
| 106 | -- | |
| 107 | You cannot propel yourself forward by patting yourself on the back. | |
| 108 | ||
| 109 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 110 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 111 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 112 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |