projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| a2e11672 AG |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.213 | |
| 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.213 | |
| 11 | Problem: Javascript object literal is not indented correctly. | |
| 12 | Solution: Make a special case for when "J1" is in 'cino'. (Luc Deschenaux) | |
| 13 | Files: src/misc1.c, src/testdir/test3.in, src/testdir/test3.ok | |
| 14 | ||
| 15 | ||
| 16 | *** ../mercurial/vim73/src/misc1.c 2011-05-25 17:29:40.000000000 +0200 | |
| 17 | --- src/misc1.c 2011-06-10 04:58:10.000000000 +0200 | |
| 18 | *************** | |
| 19 | *** 6965,6971 **** | |
| 20 | * ldfd) { | |
| 21 | * } | |
| 22 | */ | |
| 23 | ! if ((ind_keep_case_label | |
| 24 | && cin_iscase(skipwhite(ml_get_curline()), FALSE))) | |
| 25 | amount = get_indent(); | |
| 26 | else | |
| 27 | --- 6965,6971 ---- | |
| 28 | * ldfd) { | |
| 29 | * } | |
| 30 | */ | |
| 31 | ! if (ind_js || (ind_keep_case_label | |
| 32 | && cin_iscase(skipwhite(ml_get_curline()), FALSE))) | |
| 33 | amount = get_indent(); | |
| 34 | else | |
| 35 | *** ../mercurial/vim73/src/testdir/test3.in 2011-05-25 15:16:06.000000000 +0200 | |
| 36 | --- src/testdir/test3.in 2011-06-12 21:44:12.000000000 +0200 | |
| 37 | *************** | |
| 38 | *** 1492,1501 **** | |
| 39 | ||
| 40 | STARTTEST | |
| 41 | :set cino=N-s | |
| 42 | ! /namespaces | |
| 43 | =/^NAMESPACEEND | |
| 44 | ENDTEST | |
| 45 | ||
| 46 | /* valid namespaces with normal indent */ | |
| 47 | namespace | |
| 48 | { | |
| 49 | --- 1492,1502 ---- | |
| 50 | ||
| 51 | STARTTEST | |
| 52 | :set cino=N-s | |
| 53 | ! /^NAMESPACESTART | |
| 54 | =/^NAMESPACEEND | |
| 55 | ENDTEST | |
| 56 | ||
| 57 | + NAMESPACESTART | |
| 58 | /* valid namespaces with normal indent */ | |
| 59 | namespace | |
| 60 | { | |
| 61 | *************** | |
| 62 | *** 1561,1566 **** | |
| 63 | --- 1562,1588 ---- | |
| 64 | ||
| 65 | ||
| 66 | STARTTEST | |
| 67 | + :set cino=J1 | |
| 68 | + /^JSSTART | |
| 69 | + =/^JSEND | |
| 70 | + ENDTEST | |
| 71 | + | |
| 72 | + JSSTART | |
| 73 | + var bar = { | |
| 74 | + foo: { | |
| 75 | + that: this, | |
| 76 | + some: ok, | |
| 77 | + }, | |
| 78 | + "bar":{ | |
| 79 | + a : 2, | |
| 80 | + b: "123abc", | |
| 81 | + x: 4, | |
| 82 | + "y": 5 | |
| 83 | + } | |
| 84 | + } | |
| 85 | + JSEND | |
| 86 | + | |
| 87 | + STARTTEST | |
| 88 | :g/^STARTTEST/.,/^ENDTEST/d | |
| 89 | :1;/start of AUTO/,$wq! test.out | |
| 90 | ENDTEST | |
| 91 | *** ../mercurial/vim73/src/testdir/test3.ok 2011-05-25 15:16:06.000000000 +0200 | |
| 92 | --- src/testdir/test3.ok 2011-06-12 21:44:26.000000000 +0200 | |
| 93 | *************** | |
| 94 | *** 1337,1342 **** | |
| 95 | --- 1337,1343 ---- | |
| 96 | } | |
| 97 | ||
| 98 | ||
| 99 | + NAMESPACESTART | |
| 100 | /* valid namespaces with normal indent */ | |
| 101 | namespace | |
| 102 | { | |
| 103 | *************** | |
| 104 | *** 1401,1403 **** | |
| 105 | --- 1402,1420 ---- | |
| 106 | NAMESPACEEND | |
| 107 | ||
| 108 | ||
| 109 | + | |
| 110 | + JSSTART | |
| 111 | + var bar = { | |
| 112 | + foo: { | |
| 113 | + that: this, | |
| 114 | + some: ok, | |
| 115 | + }, | |
| 116 | + "bar":{ | |
| 117 | + a : 2, | |
| 118 | + b: "123abc", | |
| 119 | + x: 4, | |
| 120 | + "y": 5 | |
| 121 | + } | |
| 122 | + } | |
| 123 | + JSEND | |
| 124 | + | |
| 125 | *** ../vim-7.3.212/src/version.c 2011-06-12 21:37:06.000000000 +0200 | |
| 126 | --- src/version.c 2011-06-12 21:48:34.000000000 +0200 | |
| 127 | *************** | |
| 128 | *** 711,712 **** | |
| 129 | --- 711,714 ---- | |
| 130 | { /* Add new patch number below this line */ | |
| 131 | + /**/ | |
| 132 | + 213, | |
| 133 | /**/ | |
| 134 | ||
| 135 | -- | |
| 136 | hundred-and-one symptoms of being an internet addict: | |
| 137 | 169. You hire a housekeeper for your home page. | |
| 138 | ||
| 139 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 140 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 141 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 142 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |