updated for version 7.3.612

Problem:    Auto formatting messes up text when 'fo' contains "2". (ZyX)
Solution:   Decrement "less_cols". (Tor Perkins)

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++;
 	    }
 	}

src/testdir/test68.in

@@ -93,6 +93,16 @@ ENDTEST
    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
 /^#/
 :setl tw=12 fo=tqnc comments=:#

src/testdir/test68.ok

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

src/version.c

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