updated for version 7.2-301v7.2.301

5 files changed, 374 insertions, 1 deletions

diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 8f9fd13561..efad475bf6 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -22,7 +22,8 @@ SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \
 		test48.out test49.out test51.out test52.out test53.out \
 		test54.out test55.out test56.out test57.out test58.out \
 		test59.out test60.out test61.out test62.out test63.out \
-		test64.out test65.out test66.out test67.out
+		test64.out test65.out test66.out test67.out test68.out \
+		test69.out
 
 SCRIPTS_GUI = test16.out
 
diff --git a/src/testdir/test68.in b/src/testdir/test68.in
new file mode 100644
index 0000000000..94104c07bd
--- /dev/null
+++ b/src/testdir/test68.in
@@ -0,0 +1,56 @@
+Test for text formatting.
+
+Results of test68:
+
+STARTTEST
+:so small.vim
+/^{/+1
+:set noai tw=2 fo=t
+gRa b
+ENDTEST
+
+{
+    
+
+}
+
+STARTTEST
+/^{/+1
+:set ai tw=2 fo=tw
+gqgqjjllab
+ENDTEST
+
+{
+a  b  
+
+a    
+}
+
+STARTTEST
+/^{/+1
+:set tw=3 fo=t
+gqgqo
+a 

+ENDTEST
+
+{
+a 

+}
+
+STARTTEST
+/^{/+1
+:set tw=2 fo=tcq1 comments=:#
+gqgqjgqgqo
+a b
+#a b
+ENDTEST
+
+{
+a b
+#a b
+}
+
+STARTTEST
+:g/^STARTTEST/.,/^ENDTEST/d
+:1;/^Results/,$wq! test.out
+ENDTEST
diff --git a/src/testdir/test68.ok b/src/testdir/test68.ok
new file mode 100644
index 0000000000..85f35cfca1
--- /dev/null
+++ b/src/testdir/test68.ok
@@ -0,0 +1,35 @@
+Results of test68:
+
+
+{
+a
+b
+}
+
+
+{
+a  
+b  
+
+a  
+b
+}
+
+
+{
+a
+

+
+a
+

+}
+
+
+{
+a b
+#a b
+
+a b
+#a b
+}
+
diff --git a/src/testdir/test69.in b/src/testdir/test69.in
new file mode 100644
index 0000000000..578f76bdf2
--- /dev/null
+++ b/src/testdir/test69.in
@@ -0,0 +1,139 @@
+Test for multi-byte text formatting.
+
+STARTTEST
+:so mbyte.vim
+:set encoding=utf-8
+ENDTEST
+
+Results of test69:
+
+STARTTEST
+/^{/+1
+:set tw=2 fo=t
+gqgqjgqgqo
+ＸＹＺ
+abc ＸＹＺ
+ENDTEST
+
+{
+ＸＹＺ
+abc ＸＹＺ
+}
+
+STARTTEST
+/^{/+1
+:set tw=1 fo=tm
+gqgqjgqgqjgqgqjgqgqjgqgqo
+Ｘ
+Ｘa
+Ｘ a
+ＸＹ
+Ｘ Ｙ
+ENDTEST
+
+{
+Ｘ
+Ｘa
+Ｘ a
+ＸＹ
+Ｘ Ｙ
+}
+
+STARTTEST
+/^{/+1
+:set tw=2 fo=tm
+gqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqo
+Ｘ
+Ｘa
+Ｘ a
+ＸＹ
+Ｘ Ｙ
+aＸ
+abＸ
+abcＸ
+abＸ c
+abＸＹ
+ENDTEST
+
+{
+Ｘ
+Ｘa
+Ｘ a
+ＸＹ
+Ｘ Ｙ
+aＸ
+abＸ
+abcＸ
+abＸ c
+abＸＹ
+}
+
+STARTTEST
+/^{/+1
+:set ai tw=2 fo=tm
+gqgqjgqgqo
+Ｘ
+Ｘa
+ENDTEST
+
+{
+  Ｘ
+  Ｘa
+}
+
+STARTTEST
+/^{/+1
+:set noai tw=2 fo=tm
+gqgqjgqgqo
+  Ｘ
+  Ｘa
+ENDTEST
+
+{
+  Ｘ
+  Ｘa
+}
+
+STARTTEST
+/^{/+1
+:set tw=2 fo=cqm comments=n:Ｘ
+gqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqo
+Ｘ
+Ｘa
+ＸaＹ
+ＸＹ
+ＸＹＺ
+Ｘ Ｙ
+Ｘ ＹＺ
+ＸＸ
+ＸＸa
+ＸＸＹ
+ENDTEST
+
+{
+Ｘ
+Ｘa
+ＸaＹ
+ＸＹ
+ＸＹＺ
+Ｘ Ｙ
+Ｘ ＹＺ
+ＸＸ
+ＸＸa
+ＸＸＹ
+}
+
+STARTTEST
+/^{/+1
+:set tw=2 fo=tm
+RＸa
+ENDTEST
+
+{
+
+}
+
+STARTTEST
+:g/^STARTTEST/.,/^ENDTEST/d
+:1;/^Results/,$wq! test.out
+ENDTEST
diff --git a/src/testdir/test69.ok b/src/testdir/test69.ok
new file mode 100644
index 0000000000..3dfe402e98
--- /dev/null
+++ b/src/testdir/test69.ok
@@ -0,0 +1,142 @@
+Results of test69:
+
+
+{
+ＸＹＺ
+abc
+ＸＹＺ
+
+ＸＹＺ
+abc
+ＸＹＺ
+}
+
+
+{
+Ｘ
+Ｘ
+a
+Ｘ
+a
+Ｘ
+Ｙ
+Ｘ
+Ｙ
+
+Ｘ
+Ｘ
+a
+Ｘ
+a
+Ｘ
+Ｙ
+Ｘ
+Ｙ
+}
+
+
+{
+Ｘ
+Ｘ
+a
+Ｘ
+a
+Ｘ
+Ｙ
+Ｘ
+Ｙ
+a
+Ｘ
+ab
+Ｘ
+abc
+Ｘ
+ab
+Ｘ
+c
+ab
+Ｘ
+Ｙ
+
+Ｘ
+Ｘ
+a
+Ｘ
+a
+Ｘ
+Ｙ
+Ｘ
+Ｙ
+a
+Ｘ
+ab
+Ｘ
+abc
+Ｘ
+ab
+Ｘ
+c
+ab
+Ｘ
+Ｙ
+}
+
+
+{
+  Ｘ
+  Ｘ
+  a
+
+  Ｘ
+  Ｘ
+  a
+}
+
+
+{
+  Ｘ
+  Ｘ
+a
+
+  Ｘ
+  Ｘ
+a
+}
+
+
+{
+Ｘ
+Ｘa
+Ｘa
+ＸＹ
+ＸＹ
+ＸＹ
+ＸＺ
+Ｘ Ｙ
+Ｘ Ｙ
+Ｘ Ｚ
+ＸＸ
+ＸＸa
+ＸＸＹ
+
+Ｘ
+Ｘa
+Ｘa
+ＸＹ
+ＸＹ
+ＸＹ
+ＸＺ
+Ｘ Ｙ
+Ｘ Ｙ
+Ｘ Ｚ
+ＸＸ
+ＸＸa
+ＸＸＹ
+}
+
+
+{
+Ｘ
+a
+}
+