diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim index bc3c698055..6cbb83651f 100644 --- a/src/testdir/test_gui.vim +++ b/src/testdir/test_gui.vim @@ -48,7 +48,9 @@ func Test_colorscheme() call assert_equal("\ntorte", execute('colorscheme')) let a = substitute(execute('hi Search'), "\n\\s\\+", ' ', 'g') - call assert_match("\nSearch xxx term=reverse ctermfg=0 ctermbg=12 gui=bold guifg=Black guibg=Red", a) + " FIXME: temporarily check less while the colorscheme changes + " call assert_match("\nSearch xxx term=reverse cterm=reverse ctermfg=196 ctermbg=16 gui=reverse guifg=#ff0000 guibg=#000000", a) + call assert_match("\nSearch xxx term=reverse ", a) call assert_fails('colorscheme does_not_exist', 'E185:') diff --git a/src/version.c b/src/version.c index c9ec30111b..9017eeb1f5 100644 --- a/src/version.c +++ b/src/version.c @@ -746,6 +746,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 4952, /**/ 4951, /**/