From 82820d9bf14ba5374c24fff2ed6e577a67c6ddf2 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 30 Mar 2021 20:54:28 +0200
Subject: [PATCH] patch 8.2.2678: test for 'autoshelldir' does not reset the
 option

Problem:    Test for 'autoshelldir' does not reset the option.
Solution:   Reset the option after testing.
---
 src/testdir/test_terminal3.vim | 2 ++
 src/version.c                  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/testdir/test_terminal3.vim b/src/testdir/test_terminal3.vim
index ab926b686a..f4cc38acb0 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 012530f43e..76ab0671ea 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2678,
 /**/
     2677,
 /**/