summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_display.vim5
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/testdir/test_display.vim b/src/testdir/test_display.vim
index 4616da5653..754046f2ae 100644
--- a/src/testdir/test_display.vim
+++ b/src/testdir/test_display.vim
@@ -268,12 +268,13 @@ func Test_eob_fillchars()
call assert_fails(':set fillchars=eob:<ff>', 'E474:')
" default is ~
new
+ redraw
call assert_equal('~', Screenline(2))
set fillchars=eob:+
- redraw!
+ redraw
call assert_equal('+', Screenline(2))
set fillchars=eob:\
- redraw!
+ redraw
call assert_equal(' ', nr2char(screenchar(2, 1)))
set fillchars&
close
diff --git a/src/version.c b/src/version.c
index 2c52166d69..3a5365a867 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2641,
+/**/
2640,
/**/
2639,