# HG changeset patch # User Christian Brabandt # Date 1511713805 -3600 # Node ID 2d54f1e7ba0fa718b6c88a833982ea59d9ceb5ea # Parent 7a11b4c0e9127e467f7aa2cb6463c2ba5d9bafc0 patch 8.0.1348: make testclean deletes script file on MS-Windows commit https://github.com/vim/vim/commit/c8c75796a60e89210cc470f1b3864546fd4f319a Author: Bram Moolenaar Date: Sun Nov 26 17:18:06 2017 +0100 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 --- 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/color_ramp.vim b/src/testdir/color_ramp.vim new file mode 100644 --- /dev/null +++ b/src/testdir/color_ramp.vim @@ -0,0 +1,41 @@ +" Script to generate a file that shows al 256 xterm colors + +new +call setline(1, 'ANSI') + +" ANSI colors +let s = '' +for nr in range(0, 7) + let s .= "\033[4" . nr . "m " +endfor +for nr in range(8, 15) + let s .= "\033[10" . (nr - 8) . "m " +endfor +" Add | in original color pair to see white background. +let s .= "\033[m|" +call setline(2, s) + +" 6 x 6 x 6 color cube +call setline(3, 'color cube') +for high in range(0, 5) + let s = '' + for low in range(0, 35) + let nr = low + high * 36 + let s .= "\033[48;5;" . (nr + 16) . "m " + endfor + let s .= "\033[m|" + call setline(high + 4, s) +endfor + +" 24 shades of grey +call setline(10, 'grey ramp') +let s = '' +for nr in range(0, 23) + let s .= "\033[48;5;" . (nr + 232) . "m " +endfor +let s .= "\033[m|" +call setline(11, s) + +set binary +write! :h/color_ramp.txt +quit diff --git a/src/testdir/xterm_ramp.vim b/src/testdir/xterm_ramp.vim deleted file mode 100644 --- a/src/testdir/xterm_ramp.vim +++ /dev/null @@ -1,40 +0,0 @@ -" Script to generate a file that shows al 256 xterm colors - -new -call setline(1, 'ANSI') - -" ANSI colors -let s = '' -for nr in range(0, 7) - let s .= "\033[4" . nr . "m " -endfor -for nr in range(8, 15) - let s .= "\033[10" . (nr - 8) . "m " -endfor -let s .= "\033[107m|" -call setline(2, s) - -" 6 x 6 x 6 color cube -call setline(3, 'color cube') -for high in range(0, 5) - let s = '' - for low in range(0, 35) - let nr = low + high * 36 - let s .= "\033[48;5;" . (nr + 16) . "m " - endfor - let s .= "\033[107m|" - call setline(high + 4, s) -endfor - -" 24 shades of grey -call setline(10, 'grey ramp') -let s = '' -for nr in range(0, 23) - let s .= "\033[48;5;" . (nr + 232) . "m " -endfor -let s .= "\033[107m|" -call setline(11, s) - -set binary -write! :h/xterm_ramp.txt -quit diff --git a/src/version.c b/src/version.c --- 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,