patch 8.0.1348: make testclean deletes script file on MS-Windows

Problem:    Make testclean deletes script file on MS-Windows.
Solution:   Rename file to avoid it starting with an "x".

diff --git a/Filelist b/Filelist
index 9328943888aef6e18b9a800c86fe35c5161d0099..12d9e003d949831b866d468277b92b279e645563 100644 (file)
--- a/Filelist
+++ b/Filelist
@@ -119,7 +119,6 @@ SRC_ALL =   \
                src/testdir/test[0-9]*a.ok \
                src/testdir/test_[a-z]*.ok \
                src/testdir/test49.vim \
-               src/testdir/test60.vim \
                src/testdir/test83-tags? \
                src/testdir/test77a.com \
                src/testdir/test_*.vim \
@@ -138,7 +137,7 @@ SRC_ALL =   \
                src/testdir/samples/*.txt \
                src/testdir/samples/test000 \
                src/testdir/if_ver*.vim \
-               src/testdir/xterm_ramp.vim \
+               src/testdir/color_ramp.vim \
                src/proto.h \
                src/proto/arabic.pro \
                src/proto/beval.pro \

diff --git a/src/testdir/xterm_ramp.vim b/src/testdir/color_ramp.vim
similarity index 82%
rename from src/testdir/xterm_ramp.vim
rename to src/testdir/color_ramp.vim
index 3c8388262a62da27a62d5dcacd48d65944a8e4d9..0219f3f5674cedcd4e5b96864e6290a4bceecbce 100644 (file)
--- a/src/testdir/xterm_ramp.vim
+++ b/src/testdir/color_ramp.vim
@@ -11,7 +11,8 @@ endfor
 for nr in range(8, 15)
   let s .= "\033[10" . (nr - 8) . "m    "
 endfor
-let s .= "\033[107m|"
+" Add | in original color pair to see white background.
+let s .= "\033[m|"
 call setline(2, s)
 
 " 6 x 6 x 6 color cube
@@ -22,7 +23,7 @@ for high in range(0, 5)
     let nr = low + high * 36
     let s .= "\033[48;5;" . (nr + 16) . "m  "
   endfor
-  let s .= "\033[107m|"
+  let s .= "\033[m|"
   call setline(high + 4, s)
 endfor
 
@@ -32,9 +33,9 @@ let s = ''
 for nr in range(0, 23)
     let s .= "\033[48;5;" . (nr + 232) . "m   "
 endfor
-let s .= "\033[107m|"
+let s .= "\033[m|"
 call setline(11, s)
 
 set binary
-write! <sfile>:h/xterm_ramp.txt
+write! <sfile>:h/color_ramp.txt
 quit

diff --git a/src/version.c b/src/version.c
index f5ad775256c7fdb24776e9afa4dcf52de9494b10..8f0625d89cbe3362d3606355ad9f7fdf523179b2 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1348,
 /**/
     1347,
 /**/