diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-08-04 21:21:13 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-08-04 21:21:13 +0200 |
| commit | 9d5b876d458e242b8b5e44da10c5cdc6bbb7f57c (patch) | |
| tree | 580e88bcd033c6d8665e4934c4cfa7e87900fa2e | |
| parent | fe9489233c463dd87046df3fd95332e47b66e93c (diff) | |
patch 7.4.2155v7.4.2155
Problem: Quotes make GUI test fail on MS-Windows.
Solution: Remove quotes, strip white space.
| -rw-r--r-- | src/testdir/test_gui.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim index cd698e37af..d56015cea3 100644 --- a/src/testdir/test_gui.vim +++ b/src/testdir/test_gui.vim @@ -21,8 +21,8 @@ endfunc func Test_shell_command() new - r !echo 'hello' - call assert_equal('hello', getline(2)) + r !echo hello + call assert_equal('hello', substitute(getline(2), '\W', '', 'g')) bwipe! call assert_true(1, match(execute('winpos'), 'Window position: X \d\+, Y \d\+') >= 0) endfunc diff --git a/src/version.c b/src/version.c index c99fff65d3..a4392eb1ea 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 */ /**/ + 2155, +/**/ 2154, /**/ 2153, |