summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-08-07 16:50:10 +0200
committerBram Moolenaar <Bram@vim.org>2016-08-07 16:50:10 +0200
commite4a76ad0e74a31bbd9f1b1ac5b816d714d19a412 (patch)
treea57feec1f8c1149e16aee9d8f4aacf8236d22b89
parent3a938383396d4ab352bbb4d806938302debdae2c (diff)
downloadvim-git-e4a76ad0e74a31bbd9f1b1ac5b816d714d19a412.tar.gz
patch 7.4.2179v7.4.2179
Problem: Reading from stdin test fails on MS-Windows. Solution: Strip the extra space.
-rw-r--r--src/testdir/test_startup.vim3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim
index 652318fb7..0522ecc82 100644
--- a/src/testdir/test_startup.vim
+++ b/src/testdir/test_startup.vim
@@ -177,7 +177,8 @@ func Test_read_stdin()
\ ]
if RunVimPiped([], after, '-', 'echo something | ')
let lines = readfile('Xtestout')
- call assert_equal('something', lines[0])
+ " MS-Windows adds a space after the word
+ call assert_equal(['something'], split(lines[0]))
endif
call delete('Xtestout')
endfunc
diff --git a/src/version.c b/src/version.c
index d87abe85c..c9197f44a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2179,
+/**/
2178,
/**/
2177,