diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-12-17 20:29:26 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-12-17 20:29:26 +0100 |
| commit | a48e78e11f2b647183fd12f569020756b17d7683 (patch) | |
| tree | 03a1de13c5677480466caa63d669f34406497117 | |
| parent | e74331db4b1b6a64fbbc188ff9bc472a478b9a4e (diff) | |
| download | vim-git-a48e78e11f2b647183fd12f569020756b17d7683.tar.gz | |
patch 8.2.0016: test name used twice, option not restored properlyv8.2.0016
Problem: Test name used twice, option not restored properly.
Solution: Rename function, restore option with "&".
| -rw-r--r-- | src/testdir/test_textformat.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/testdir/test_textformat.vim b/src/testdir/test_textformat.vim index 1364dd78c..2223be952 100644 --- 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 index ed57cd8d0..e299ee974 100644 --- 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, |