summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-11-05 19:54:01 +0100
committerBram Moolenaar <Bram@vim.org>2016-11-05 19:54:01 +0100
commiteb828d01d9c91791fa1fe217ba651cdc25746d1b (patch)
treea6e4d1cab162a247b3a2191c168b4afb80057234
parent55952d4dd490bb2f63bda5d7f6d8fb69f58c333c (diff)
downloadvim-git-eb828d01d9c91791fa1fe217ba651cdc25746d1b.tar.gz
patch 8.0.0064v8.0.0064
Problem: Normal test fails on MS-Windows. Solution: Don't try using an illegal file name.
-rw-r--r--src/testdir/test_normal.vim10
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 4 deletions
diff --git a/src/testdir/test_normal.vim b/src/testdir/test_normal.vim
index 20cbaa00f..4dafe3c10 100644
--- a/src/testdir/test_normal.vim
+++ b/src/testdir/test_normal.vim
@@ -1248,10 +1248,12 @@ func! Test_normal23_K()
norm! K
call assert_equal('aa%bb', fnamemodify(bufname('%'), ':t'))
bwipe!
- 4
- norm! K
- call assert_equal('cc|dd', fnamemodify(bufname('%'), ':t'))
- bwipe!
+ if !has('win32')
+ 4
+ norm! K
+ call assert_equal('cc|dd', fnamemodify(bufname('%'), ':t'))
+ bwipe!
+ endif
set iskeyword-=%
set iskeyword-=\|
diff --git a/src/version.c b/src/version.c
index 492a5277e..1399c8751 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 64,
+/**/
63,
/**/
62,