patch 8.1.0322: Test_copy_winopt() does not restore 'hidden'
Problem: Test_copy_winopt() does not restore 'hidden'.
Solution: Restore the option, fix indent. (Ozaki Kiichi, closes #3367)
diff --git a/src/testdir/test_options.vim b/src/testdir/test_options.vim
index 2d4a97a..f341682 100644
--- a/src/testdir/test_options.vim
+++ b/src/testdir/test_options.vim
@@ -350,55 +350,57 @@
endfunc
func Test_copy_winopt()
- set hidden
+ set hidden
- " Test copy option from current buffer in window
- split
- enew
- setlocal numberwidth=5
- wincmd w
- call assert_equal(4,&numberwidth)
- bnext
- call assert_equal(5,&numberwidth)
- bw!
- call assert_equal(4,&numberwidth)
+ " Test copy option from current buffer in window
+ split
+ enew
+ setlocal numberwidth=5
+ wincmd w
+ call assert_equal(4,&numberwidth)
+ bnext
+ call assert_equal(5,&numberwidth)
+ bw!
+ call assert_equal(4,&numberwidth)
- " Test copy value from window that used to be display the buffer
- split
- enew
- setlocal numberwidth=6
- bnext
- wincmd w
- call assert_equal(4,&numberwidth)
- bnext
- call assert_equal(6,&numberwidth)
- bw!
+ " Test copy value from window that used to be display the buffer
+ split
+ enew
+ setlocal numberwidth=6
+ bnext
+ wincmd w
+ call assert_equal(4,&numberwidth)
+ bnext
+ call assert_equal(6,&numberwidth)
+ bw!
- " Test that if buffer is current, don't use the stale cached value
- " from the last time the buffer was displayed.
- split
- enew
- setlocal numberwidth=7
- bnext
- bnext
- setlocal numberwidth=8
- wincmd w
- call assert_equal(4,&numberwidth)
- bnext
- call assert_equal(8,&numberwidth)
- bw!
+ " Test that if buffer is current, don't use the stale cached value
+ " from the last time the buffer was displayed.
+ split
+ enew
+ setlocal numberwidth=7
+ bnext
+ bnext
+ setlocal numberwidth=8
+ wincmd w
+ call assert_equal(4,&numberwidth)
+ bnext
+ call assert_equal(8,&numberwidth)
+ bw!
- " Test value is not copied if window already has seen the buffer
- enew
- split
- setlocal numberwidth=9
- bnext
- setlocal numberwidth=10
- wincmd w
- call assert_equal(4,&numberwidth)
- bnext
- call assert_equal(4,&numberwidth)
- bw!
+ " Test value is not copied if window already has seen the buffer
+ enew
+ split
+ setlocal numberwidth=9
+ bnext
+ setlocal numberwidth=10
+ wincmd w
+ call assert_equal(4,&numberwidth)
+ bnext
+ call assert_equal(4,&numberwidth)
+ bw!
+
+ set hidden&
endfunc
func Test_shortmess_F()
diff --git a/src/version.c b/src/version.c
index 38afc4f..919d790 100644
--- a/src/version.c
+++ b/src/version.c
@@ -795,6 +795,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 322,
+/**/
321,
/**/
320,