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
index 34822720600ec7c56433b78d04aac52182c15d2a..69ede43ff2530abbb69a2a9481d949a96f261918 100644 (file)
--- 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 fcfc68c7b4d284e9963fcb9b780490d7e3fefa2b..e79aed50d02fda603f7a7d1e15b755d16bbd131f 100644 (file)
--- 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\e
+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 4c4a7c26978a0c888da2b713c4ca6f840f821af2..7ec93e6358a70bdfaade7025d0e63cf97b945a5f 100644 (file)
--- 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 ed205bbc3cbb7175622a9960570531cc2d406b07..bf2cec904d0ba2de52c806fc2ba6046bc9ea8d49 100644 (file)
--- 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,
 /**/