summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-06-09 19:58:32 +0200
committerBram Moolenaar <Bram@vim.org>2015-06-09 19:58:32 +0200
commitd68f2219b57acb86ddedebdcc1476fee15c9c0c7 (patch)
tree6e02e08565ded00ed76c8f83decc999982681417
parentf2571c61d5aa05682ae4d358e625348b61adc861 (diff)
downloadvim-git-d68f2219b57acb86ddedebdcc1476fee15c9c0c7.tar.gz
patch 7.4.733v7.4.733
Problem: test_listchars breaks on MS-Windows. (Kenichi Ito) Solution: Set fileformat to "unix". (Christian Brabandt)
-rw-r--r--src/testdir/test_listchars.in1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/testdir/test_listchars.in b/src/testdir/test_listchars.in
index 1f19afa1a..241b54130 100644
--- a/src/testdir/test_listchars.in
+++ b/src/testdir/test_listchars.in
@@ -2,6 +2,7 @@ Tests for 'listchars' display with 'list' and :list
STARTTEST
:so small.vim
+:set ff=unix
:let g:lines = []
:function GetScreenCharsForLine(lnum)
: return join(map(range(1, virtcol('$')), 'nr2char(screenchar(a:lnum, v:val))'), '')
diff --git a/src/version.c b/src/version.c
index d9d6c3ab9..4e5e0c9eb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 733,
+/**/
732,
/**/
731,