summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Brabandt <cb@256bit.org>2024-08-05 21:08:42 +0200
committerChristian Brabandt <cb@256bit.org>2024-08-06 20:19:50 +0200
commit91efcd115e700725b9ebded0f5d7bc0d3fa98d9d (patch)
tree55883ec79c534d5a4ed8f841933ff93c28951103
parentafea6b946827e964271eb19579946a7f88d2f329 (diff)
patch 9.1.0663: tests: zip test still resets 'shellslash' optionv9.1.0663
Problem: tests: zip test still resets 'shellslash' option Solution: Remove resetting the 'shellslash' option, the zip plugin should now be able to handle this options closes: #15434 Signed-off-by: Christian Brabandt <cb@256bit.org>
-rw-r--r--src/testdir/test_zip_plugin.vim4
-rw-r--r--src/version.c2
2 files changed, 2 insertions, 4 deletions
diff --git a/src/testdir/test_zip_plugin.vim b/src/testdir/test_zip_plugin.vim
index 4e8eff4edf..3579a4653a 100644
--- a/src/testdir/test_zip_plugin.vim
+++ b/src/testdir/test_zip_plugin.vim
@@ -10,8 +10,6 @@ endif
runtime plugin/zipPlugin.vim
def Test_zip_basic()
- var _sl = &shellslash
- set noshellslash
### get our zip file
if !filecopy("samples/test.zip", "X.zip")
@@ -134,6 +132,4 @@ def Test_zip_basic()
bw
- &shellslash = _sl
-
enddef
diff --git a/src/version.c b/src/version.c
index 3a6faeb539..c4ade6f4f6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 663,
+/**/
662,
/**/
661,