# HG changeset patch
# User Bram Moolenaar <bram@vim.org>
# Date 1343225403 -7200
# Node ID 2b4b6185054ff05fb6ee3ab1bcde47409bf2ebe0
# Parent  5d6c73eb5333dcccfe6c94d8fe3d9459ac25ad11
updated for version 7.3.612
Problem:    Auto formatting messes up text when 'fo' contains "2". (ZyX)
Solution:   Decrement "less_cols". (Tor Perkins)

diff --git a/src/misc1.c b/src/misc1.c
--- 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
--- 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
--- 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
--- 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,