| To: vim_dev@googlegroups.com |
| Subject: Patch 7.3.549 |
| Fcc: outbox |
| From: Bram Moolenaar <Bram@moolenaar.net> |
| Mime-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| |
| Patch 7.3.549 |
| Problem: In 'cinoptions' "0s" is interpreted as one shiftwidth. (David |
| Pineau) |
| Solution: Use the zero as zero. (Lech Lorens) |
| Files: src/misc1.c, src/testdir/test3.in, src/testdir/test3.ok |
| |
| |
| |
| |
| |
| *** 6635,6640 **** |
| --- 6635,6641 ---- |
| int whilelevel; |
| linenr_T lnum; |
| char_u *options; |
| + char_u *digits; |
| int fraction = 0; /* init for GCC */ |
| int divider; |
| int n; |
| |
| *** 6650,6655 **** |
| --- 6651,6657 ---- |
| l = options++; |
| if (*options == '-') |
| ++options; |
| + digits = options; /* remember where the digits start */ |
| n = getdigits(&options); |
| divider = 0; |
| if (*options == '.') /* ".5s" means a fraction */ |
| |
| *** 6666,6672 **** |
| } |
| if (*options == 's') /* "2s" means two times 'shiftwidth' */ |
| { |
| ! if (n == 0 && fraction == 0) |
| n = curbuf->b_p_sw; /* just "s" is one 'shiftwidth' */ |
| else |
| { |
| --- 6668,6674 ---- |
| } |
| if (*options == 's') /* "2s" means two times 'shiftwidth' */ |
| { |
| ! if (options == digits) |
| n = curbuf->b_p_sw; /* just "s" is one 'shiftwidth' */ |
| else |
| { |
| |
| |
| |
| *** 977,982 **** |
| --- 977,1000 ---- |
| |
| STARTTEST |
| :set cin |
| + :set cino=es,n0s |
| + /main |
| + =][ |
| + ENDTEST |
| + |
| + main(void) |
| + { |
| + /* Make sure that cino=X0s is not parsed like cino=Xs. */ |
| + if (cond) |
| + foo(); |
| + else |
| + { |
| + bar(); |
| + } |
| + } |
| + |
| + STARTTEST |
| + :set cin |
| :set cino= |
| ]]=][ |
| ENDTEST |
| |
| |
| |
| *** 940,945 **** |
| --- 940,957 ---- |
| } |
| |
| |
| + main(void) |
| + { |
| + /* Make sure that cino=X0s is not parsed like cino=Xs. */ |
| + if (cond) |
| + foo(); |
| + else |
| + { |
| + bar(); |
| + } |
| + } |
| + |
| + |
| { |
| do |
| { |
| |
| |
| |
| *** 716,717 **** |
| --- 716,719 ---- |
| { /* Add new patch number below this line */ |
| + /**/ |
| + 549, |
| /**/ |
| |
| -- |
| hundred-and-one symptoms of being an internet addict: |
| 29. Your phone bill comes to your doorstep in a box. |
| |
| /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ |
| /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ |
| \\\ an exciting new programming language -- http://www.Zimbu.org /// |
| \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |