# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1576611004 -3600
# Node ID e8fe65da419856c8c117fec78d23f5a2bd5ea98c
# Parent  1e18ba13a32c58b522ac92259e7b59d810b13e4b
patch 8.2.0016: test name used twice, option not restored properly

Commit: https://github.com/vim/vim/commit/a48e78e11f2b647183fd12f569020756b17d7683
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue Dec 17 20:29:26 2019 +0100

    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 "&".

diff --git a/src/testdir/test_textformat.vim b/src/testdir/test_textformat.vim
--- a/src/testdir/test_textformat.vim
+++ b/src/testdir/test_textformat.vim
@@ -906,7 +906,7 @@ func Test_ra_multibyte()
 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 @@ func Test_whichwrap()
 
   set whichwrap+=h
   normal dh
-  set whichwrap-=h
+  set whichwrap&
 
   let expected =<< trim END
     áx
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    16,
+/**/
     15,
 /**/
     14,