summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-11-26 17:18:06 +0100
committerBram Moolenaar <Bram@vim.org>2017-11-26 17:18:06 +0100
commitc8c75796a60e89210cc470f1b3864546fd4f319a (patch)
treee8f8375c22e403ce8ca69cad59ef4330435932b6
parente0aa23f7e3cc389251ecb3266926ac7d83056b1b (diff)
patch 8.0.1348: make testclean deletes script file on MS-Windowsv8.0.1348
Problem: Make testclean deletes script file on MS-Windows. Solution: Rename file to avoid it starting with an "x".
-rw-r--r--Filelist3
-rw-r--r--src/testdir/color_ramp.vim (renamed from src/testdir/xterm_ramp.vim)9
-rw-r--r--src/version.c2
3 files changed, 8 insertions, 6 deletions
diff --git a/Filelist b/Filelist
index 9328943888..12d9e003d9 100644
--- 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
index 3c8388262a..0219f3f567 100644
--- 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 f5ad775256..8f0625d89c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1348,
+/**/
1347,
/**/
1346,