summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-03-30 20:54:28 +0200
committerBram Moolenaar <Bram@vim.org>2021-03-30 20:54:28 +0200
commit82820d9bf14ba5374c24fff2ed6e577a67c6ddf2 (patch)
treecf503c0af3ed00a732b2d94a23d465978fadcce9 /src
parent38a3bfa9a2931729a5e0c28dc087f745b68988ef (diff)
downloadvim-git-82820d9bf14ba5374c24fff2ed6e577a67c6ddf2.tar.gz
patch 8.2.2678: test for 'autoshelldir' does not reset the optionv8.2.2678
Problem: Test for 'autoshelldir' does not reset the option. Solution: Reset the option after testing.
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_terminal3.vim2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/testdir/test_terminal3.vim b/src/testdir/test_terminal3.vim
index ab926b686..f4cc38acb 100644
--- a/src/testdir/test_terminal3.vim
+++ b/src/testdir/test_terminal3.vim
@@ -502,6 +502,8 @@ func Test_terminal_sync_shell_dir()
let expected = tmpfolder
endif
call assert_equal(expected, getcwd(winnr()))
+
+ set noasd
endfunc
" Test for modeless selection in a terminal
diff --git a/src/version.c b/src/version.c
index 012530f43..76ab0671e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2678,
+/**/
2677,
/**/
2676,