diff options
| author | Bram Moolenaar <Bram@vim.org> | 2012-07-25 16:10:03 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2012-07-25 16:10:03 +0200 |
| commit | 5fb9ec5ed7a99e85f304b3450f9a8c6886fc779d (patch) | |
| tree | a4a8064fee036443b816cc63916297cd4a5a702a | |
| parent | 9581b5f70ea311bba35c537f0111a15bc96249c3 (diff) | |
| download | vim-git-7.3.612.tar.gz | |
updated for version 7.3.612v7.3.612
Problem: Auto formatting messes up text when 'fo' contains "2". (ZyX)
Solution: Decrement "less_cols". (Tor Perkins)
| -rw-r--r-- | src/misc1.c | 1 | ||||
| -rw-r--r-- | src/testdir/test68.in | 10 | ||||
| -rw-r--r-- | src/testdir/test68.ok | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 19 insertions, 0 deletions
diff --git a/src/misc1.c b/src/misc1.c index 348227206..69ede43ff 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -1329,6 +1329,7 @@ open_line(dir, flags, second_line_indent) for (i = 0; i < padding; i++) { STRCAT(leader, " "); + less_cols--; newcol++; } } diff --git a/src/testdir/test68.in b/src/testdir/test68.in index fcfc68c7b..e79aed50d 100644 --- a/src/testdir/test68.in +++ b/src/testdir/test68.in @@ -94,6 +94,16 @@ ENDTEST } STARTTEST +/mno pqr/ +:setl tw=20 fo=an12wcq comments=s1:/*,mb:*,ex:*/ +A vwx yz +ENDTEST + +/* abc def ghi jkl + * mno pqr stu + */ + +STARTTEST /^#/ :setl tw=12 fo=tqnc comments=:# A foobar diff --git a/src/testdir/test68.ok b/src/testdir/test68.ok index 4c4a7c269..7ec93e635 100644 --- a/src/testdir/test68.ok +++ b/src/testdir/test68.ok @@ -57,6 +57,12 @@ a b { 1aa ^^2bb } +/* abc def ghi jkl + * mno pqr stu + * vwx yz + */ + + # 1 xxxxx # foobar diff --git a/src/version.c b/src/version.c index ed205bbc3..bf2cec904 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 612, +/**/ 611, /**/ 610, |