aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-25 10:54:51 -04:00
Code

updated for version 7.3.612

Browse Source 
Problem:    Auto formatting messes up text when 'fo' contains "2". (ZyX)
Solution:   Decrement "less_cols". (Tor Perkins)
This commit is contained in:
Bram Moolenaar 2012-07-25 16:10:03 +02:00
parent 9581b5f70e
commit 5fb9ec5ed7
4 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/misc1.c
View File

@ -1329,6 +1329,7 @@ open_line(dir, flags, second_line_indent)
for (i = 0; i < padding; i++) for (i = 0; i < padding; i++)
{ {
STRCAT(leader, " "); STRCAT(leader, " ");
less_cols--;
newcol++; newcol++;
} }
} }

10
src/testdir/test68.in
View File

@ -93,6 +93,16 @@ ENDTEST
2bb 2bb
} }
STARTTEST
/mno pqr/
:setl tw=20 fo=an12wcq comments=s1:/*,mb:*,ex:*/
A vwx yz
ENDTEST
/* abc def ghi jkl
* mno pqr stu
*/
STARTTEST STARTTEST
/^#/ /^#/
:setl tw=12 fo=tqnc comments=:# :setl tw=12 fo=tqnc comments=:#

6
src/testdir/test68.ok
View File

@ -57,6 +57,12 @@ a b
{ 1aa ^^2bb } { 1aa ^^2bb }
/* abc def ghi jkl
* mno pqr stu
* vwx yz
*/
# 1 xxxxx # 1 xxxxx
# foobar # foobar

2
src/version.c
View File

@ -714,6 +714,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
612,
/**/ /**/
611, 611,
/**/ /**/