diff options
| author | Bram Moolenaar <bram@vim.org> | 2015-06-09 19:58:32 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2015-06-09 19:58:32 +0200 |
| commit | a61f0db25035fbf2e570bdfe79cdef145a00111a (patch) | |
| tree | f90b24f688ff6ad42277e67f84a6382e37a287fb | |
| parent | ba5647cbf392c4b699fff628dcfbc6db83f095b2 (diff) | |
| download | vim-a61f0db25035fbf2e570bdfe79cdef145a00111a.tar.gz | |
Problem: test_listchars breaks on MS-Windows. (Kenichi Ito)
Solution: Set fileformat to "unix". (Christian Brabandt)
| -rw-r--r-- | src/testdir/test_listchars.in | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/testdir/test_listchars.in b/src/testdir/test_listchars.in index 1f19afa1..241b5413 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 d9d6c3ab..4e5e0c9e 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, |