diff --git a/src/testdir/test_edit.vim b/src/testdir/test_edit.vim index 80a3de650f..4a2d93fd54 100644 --- a/src/testdir/test_edit.vim +++ b/src/testdir/test_edit.vim @@ -2032,10 +2032,9 @@ endfunc " window, the window contents should be scrolled one line up. If the top line " is part of a fold, then the entire fold should be scrolled up. func Test_edit_lastline_scroll() - if has('gui_running') + if has('linux') " TODO: For unknown reasons, this test fails on CI when run in Gui mode - " with ASAN enabled, figure out why - CheckNotAsan + CheckNotGui endif new let h = winheight(0) diff --git a/src/version.c b/src/version.c index b351218395..443f85bb89 100644 --- a/src/version.c +++ b/src/version.c @@ -724,6 +724,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1702, /**/ 1701, /**/