patch 7.4.1910

Problem:    Tests using external command to delete directory.
Solution:   Use delete().

diff --git a/src/testdir/test17.in b/src/testdir/test17.in
index 3a0a9bbb79d3395994d3c97663a72ec84474ac37..59b57c24448114fdd89f577d60a7e0b36a71d429 100644 (file)
--- a/src/testdir/test17.in
+++ b/src/testdir/test17.in
@@ -9,13 +9,7 @@ STARTTEST
 :else
 : set isfname=@,48-57,/,.,-,_,+,,,$,:,~,{,}
 :endif
-:function! DeleteDirectory(dir)
-: if has("win16") || has("win32") || has("win64") || has("dos16") || has("dos32")
-:  exec "silent !rmdir /Q /S " . a:dir
-: else
-:  exec "silent !rm -rf " . a:dir
-: endif
-:endfun
+:"
 :if has("unix")
 :let $CDIR = "."
 /CDIR
@@ -45,7 +39,7 @@ STARTTEST
 :" check for 'include' without \zs or \ze
 :lang C
 :call delete("./Xbase.a")
-:call DeleteDirectory("Xdir1")
+:call delete("Xdir1", "rf")
 :!mkdir Xdir1
 :!mkdir "Xdir1/dir2"
 :e! Xdir1/dir2/foo.a
@@ -70,7 +64,7 @@ ENDTEST
 STARTTEST
 :" check for 'include' with \zs and \ze
 :call delete("./Xbase.b")
-:call DeleteDirectory("Xdir1")
+:call delete("Xdir1", "rf")
 :!mkdir Xdir1
 :!mkdir "Xdir1/dir2"
 :let &include='^\s*%inc\s*/\zs[^/]\+\ze'
@@ -100,7 +94,7 @@ ENDTEST
 STARTTEST
 :" check for 'include' with \zs and no \ze
 :call delete("./Xbase.c")
-:call DeleteDirectory("Xdir1")
+:call delete("Xdir1", "rf")
 :!mkdir Xdir1
 :!mkdir "Xdir1/dir2"
 :let &include='^\s*%inc\s*\%([[:upper:]][^[:space:]]*\s\+\)\?\zs\S\+\ze'

diff --git a/src/testdir/test73.in b/src/testdir/test73.in
index 666e4d2e50d0ffc20ab2917badb723e624b230bf..a0b9ae8a146adde591d6a5600be09ef26a5a7928 100644 (file)
--- a/src/testdir/test73.in
+++ b/src/testdir/test73.in
@@ -9,16 +9,9 @@ STARTTEST
 :set visualbell
 :set nocp viminfo+=nviminfo
 :"
-:function! DeleteDirectory(dir)
-: if has("win16") || has("win32") || has("win64") || has("dos16") || has("dos32")
-:  exec "silent !rmdir /Q /S " . a:dir
-: else
-:  exec "silent !rm -rf " . a:dir
-: endif
-:endfun
 :" On windows a stale "Xfind" directory may exist, remove it so that
 :" we start from a clean state.
-:call DeleteDirectory("Xfind")
+:call delete("Xfind", "rf")
 :new
 :let cwd=getcwd()
 :let test_out = cwd . '/test.out'
@@ -170,7 +163,7 @@ SVoyager 2\e:w
 :exec "w >>" . test_out
 :q
 :exec "cd " . cwd
-:call DeleteDirectory("Xfind")
+:call delete("Xfind", "rf")
 :qa!
 ENDTEST
 

diff --git a/src/testdir/test_getcwd.in b/src/testdir/test_getcwd.in
index 8c7b24ebf0f6e1e8180a503270c6afde2d6831d9..e92ea1b8e0cf7b09f3f1c60a50b7da77cfc7467a 100644 (file)
--- a/src/testdir/test_getcwd.in
+++ b/src/testdir/test_getcwd.in
@@ -9,14 +9,6 @@ STARTTEST
 :set visualbell
 :set nocp viminfo+=nviminfo
 :"
-:function! DeleteDirectory(dir)
-: if has("win16") || has("win32") || has("win64") || has("dos16") || has("dos32")
-:  exec "silent !rmdir /Q /S " . a:dir
-: else
-:  exec "silent !rm -rf " . a:dir
-: endif
-:endfun
-:"
 :function! GetCwdInfo(win, tab)
 : let tab_changed = 0
 : let mod = ":t"
@@ -42,7 +34,7 @@ STARTTEST
 :endfunction
 :" On windows a stale "Xtopdir" directory may exist, remove it so that
 :" we start from a clean state.
-:call DeleteDirectory("Xtopdir")
+:call delete("Xtopdir", "rf")
 :let r=[]
 :new
 :let cwd=getcwd()
@@ -94,7 +86,7 @@ STARTTEST
 :call writefile(r, test_out, "a")
 :q
 :exec "cd " . cwd
-:call DeleteDirectory("Xtopdir")
+:call delete("Xtopdir", "rf")
 :qa!
 ENDTEST
 

diff --git a/src/version.c b/src/version.c
index 9aba54cb2c42d858b2616b3600c2196855a11382..ad79efff1bea084e363363215e133c78fa82f0f1 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1910,
 /**/
     1909,
 /**/