From 545cb79da586be3333a0a55616046f94b01f6b1a Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 23 May 2017 11:31:22 +0200 Subject: [PATCH 1/4] patch 8.0.0601: no test coverage for :spellrepall Problem: No test coverage for :spellrepall. Solution: Add a test. (Dominique Pelle, closes #1717) --- src/testdir/test_spell.vim | 17 +++++++++++++++++ src/version.c | 2 ++ 2 files changed, 19 insertions(+) diff --git a/src/testdir/test_spell.vim b/src/testdir/test_spell.vim index 0688d615e7..80a66f280a 100644 --- a/src/testdir/test_spell.vim +++ b/src/testdir/test_spell.vim @@ -27,3 +27,20 @@ func Test_z_equal_on_invalid_utf8_word() set nospell bwipe! endfunc + +func Test_spellreall() + new + set spell + call assert_fails('spellrepall', 'E752:') + call setline(1, ['A speling mistake. The same speling mistake.', + \ 'Another speling mistake.']) + call feedkeys(']s1z=', 'tx') + call assert_equal('A spelling mistake. The same speling mistake.', getline(1)) + call assert_equal('Another speling mistake.', getline(2)) + spellrepall + call assert_equal('A spelling mistake. The same spelling mistake.', getline(1)) + call assert_equal('Another spelling mistake.', getline(2)) + call assert_fails('spellrepall', 'E753:') + set spell& + bwipe! +endfunc diff --git a/src/version.c b/src/version.c index 7262a3d415..202ce954ba 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 */ +/**/ + 601, /**/ 600, /**/ From 2a79ed293c077ba791db962f0e121cf97ba4f7a7 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 24 May 2017 09:51:39 +0200 Subject: [PATCH 2/4] patch 8.0.0602: when gF fails to edit the file the cursor still moves Problem: When gF fails to edit the file the cursor still moves to the found line number. Solution: Check the return value of do_ecmd(). (Michael Hwang) --- src/normal.c | 6 +++--- src/testdir/test_gf.vim | 25 +++++++++++++++++++++++-- src/version.c | 2 ++ 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/src/normal.c b/src/normal.c index 25c0986b43..9a12267720 100644 --- a/src/normal.c +++ b/src/normal.c @@ -6250,9 +6250,9 @@ nv_gotofile(cmdarg_T *cap) if (curbufIsChanged() && curbuf->b_nwindows <= 1 && !P_HID(curbuf)) (void)autowrite(curbuf, FALSE); setpcmark(); - (void)do_ecmd(0, ptr, NULL, NULL, ECMD_LAST, - P_HID(curbuf) ? ECMD_HIDE : 0, curwin); - if (cap->nchar == 'F' && lnum >= 0) + if (do_ecmd(0, ptr, NULL, NULL, ECMD_LAST, + P_HID(curbuf) ? ECMD_HIDE : 0, curwin) == OK + && cap->nchar == 'F' && lnum >= 0) { curwin->w_cursor.lnum = lnum; check_cursor_lnum(); diff --git a/src/testdir/test_gf.vim b/src/testdir/test_gf.vim index c4aa6f9218..1f3db2401e 100644 --- a/src/testdir/test_gf.vim +++ b/src/testdir/test_gf.vim @@ -1,7 +1,7 @@ " This is a test if a URL is recognized by "gf", with the cursor before and " after the "://". Also test ":\\". -function! Test_gf_url() +func Test_gf_url() enew! call append(0, [ \ "first test for URL://machine.name/tmp/vimtest2a and other text", @@ -30,4 +30,25 @@ function! Test_gf_url() set isf&vim enew! -endfunction +endfunc + +func Test_gF() + new + call setline(1, ['111', '222', '333', '444']) + w! Xfile + close + new + call setline(1, ['one', 'Xfile:3', 'three']) + 2 + call assert_fails('normal gF', 'E37:') + call assert_equal(2, getcurpos()[1]) + w! Xfile2 + normal gF + call assert_equal('Xfile', bufname('%')) + call assert_equal(3, getcurpos()[1]) + + call delete('Xfile') + call delete('Xfile2') + bwipe Xfile + bwipe Xfile2 +endfunc diff --git a/src/version.c b/src/version.c index 202ce954ba..cb355208ec 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 */ +/**/ + 602, /**/ 601, /**/ From d7aca7a71c7254501c08f04db1798df479df0e89 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 24 May 2017 10:05:56 +0200 Subject: [PATCH 3/4] patch 8.0.0603: gF test fails on MS-Windows Problem: gF test fails on MS-Windows. Solution: Use @ instead of : before the line number --- src/testdir/test_gf.vim | 2 +- src/version.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/testdir/test_gf.vim b/src/testdir/test_gf.vim index 1f3db2401e..d5bdfab652 100644 --- a/src/testdir/test_gf.vim +++ b/src/testdir/test_gf.vim @@ -38,7 +38,7 @@ func Test_gF() w! Xfile close new - call setline(1, ['one', 'Xfile:3', 'three']) + call setline(1, ['one', 'Xfile@3', 'three']) 2 call assert_fails('normal gF', 'E37:') call assert_equal(2, getcurpos()[1]) diff --git a/src/version.c b/src/version.c index cb355208ec..6a650356e2 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 */ +/**/ + 603, /**/ 602, /**/ From 712598f210570627534246cb5dcbb4f213367997 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 24 May 2017 10:42:37 +0200 Subject: [PATCH 4/4] patch 8.0.0604: gF test fails still on MS-Windows Problem: gF test fails still on MS-Windows. Solution: Use : before the line number and remove it from 'isfname'. --- src/testdir/test_gf.vim | 4 +++- src/version.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/testdir/test_gf.vim b/src/testdir/test_gf.vim index d5bdfab652..ef1bf1075b 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 6a650356e2..bc80ace741 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 */ +/**/ + 604, /**/ 603, /**/