summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-05-24 10:42:37 +0200
committerBram Moolenaar <Bram@vim.org>2017-05-24 10:42:37 +0200
commit712598f210570627534246cb5dcbb4f213367997 (patch)
treee284623d7127546edb92e1d79b92e95fecd8e058
parentd7aca7a71c7254501c08f04db1798df479df0e89 (diff)
downloadvim-git-712598f210570627534246cb5dcbb4f213367997.tar.gz
patch 8.0.0604: gF test fails still on MS-Windowsv8.0.0604
Problem: gF test fails still on MS-Windows. Solution: Use : before the line number and remove it from 'isfname'.
-rw-r--r--src/testdir/test_gf.vim4
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/testdir/test_gf.vim b/src/testdir/test_gf.vim
index d5bdfab65..ef1bf1075 100644
--- a/src/testdir/test_gf.vim
+++ b/src/testdir/test_gf.vim
@@ -38,7 +38,8 @@ func Test_gF()
w! Xfile
close
new
- call setline(1, ['one', 'Xfile@3', 'three'])
+ set isfname-=:
+ call setline(1, ['one', 'Xfile:3', 'three'])
2
call assert_fails('normal gF', 'E37:')
call assert_equal(2, getcurpos()[1])
@@ -47,6 +48,7 @@ func Test_gF()
call assert_equal('Xfile', bufname('%'))
call assert_equal(3, getcurpos()[1])
+ set isfname&
call delete('Xfile')
call delete('Xfile2')
bwipe Xfile
diff --git a/src/version.c b/src/version.c
index 6a650356e..bc80ace74 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 */
/**/
+ 604,
+/**/
603,
/**/
602,