commit a48e78e11f2b647183fd12f569020756b17d7683
author Bram Moolenaar <Bram@vim.org> Tue Dec 17 20:29:26 2019 +0100
committer Bram Moolenaar <Bram@vim.org> Tue Dec 17 20:29:26 2019 +0100
tree 03a1de13c5677480466caa63d669f34406497117
parent e74331db4b1b6a64fbbc188ff9bc472a478b9a4e

patch 8.2.0016: test name used twice, option not restored properly

Problem:    Test name used twice, option not restored properly.
Solution:   Rename function, restore option with "&".

src/testdir/test_textformat.vim

diff --git a/src/testdir/test_textformat.vim b/src/testdir/test_textformat.vim
index 1364dd7..2223be9 100644
--- a/src/testdir/test_textformat.vim
+++ b/src/testdir/test_textformat.vim
@@ -906,7 +906,7 @@
 endfunc
 
 " Test for 'whichwrap' with multi-byte character
-func Test_whichwrap()
+func Test_whichwrap_multi_byte()
   new
   let t =<< trim END
     á
@@ -917,7 +917,7 @@
 
   set whichwrap+=h
   normal dh
-  set whichwrap-=h
+  set whichwrap&
 
   let expected =<< trim END
     áx

src/version.c

diff --git a/src/version.c b/src/version.c
index ed57cd8..e299ee9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    16,
+/**/
     15,
 /**/
     14,