From 5fb9ec5ed7a99e85f304b3450f9a8c6886fc779d Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 25 Jul 2012 16:10:03 +0200
Subject: 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           |  1 +
 src/testdir/test68.in | 10 ++++++++++
 src/testdir/test68.ok |  6 ++++++
 src/version.c         |  2 ++
 4 files changed, 19 insertions(+)

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
@@ -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=:#
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
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    612,
 /**/
     611,
 /**/
-- 
cgit v1.2.1