Mercurial > vim
changeset 9949:30be4b26a37e v7.4.2248
commit https://github.com/vim/vim/commit/358308dd99abdd56c6540339e505585d8db7bdfe
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Aug 24 21:21:26 2016 +0200
patch 7.4.2248
Problem: When cancelling the :ptjump prompt a preview window is opened for
a following command.
Solution: Reset g_do_tagpreview. (Hirohito Higashi) Add a test. Avoid that
the test runner gets stuck in trying to close a window.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Wed, 24 Aug 2016 21:30:06 +0200 |
| parents | f3f309428117 |
| children | 1d8b0ed96c06 |
| files | src/tag.c src/testdir/runtest.vim src/testdir/test_tagjump.vim src/version.c |
| diffstat | 4 files changed, 31 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/tag.c +++ b/src/tag.c @@ -1078,6 +1078,9 @@ end_do_tag: curwin->w_tagstackidx = tagstackidx; #ifdef FEAT_WINDOWS postponed_split = 0; /* don't split next time */ +# ifdef FEAT_QUICKFIX + g_do_tagpreview = 0; /* don't do tag preview next time */ +# endif #endif #ifdef FEAT_CSCOPE
--- a/src/testdir/runtest.vim +++ b/src/testdir/runtest.vim @@ -105,8 +105,17 @@ function RunTheTest(test) endif " Close any extra windows and make the current one not modified. - while winnr('$') > 1 + while 1 + let wincount = winnr('$') + if wincount == 1 + break + endif bwipe! + if wincount == winnr('$') + " Did not manage to close a window. + only! + break + endif endwhile set nomodified endfunc
--- a/src/testdir/test_tagjump.vim +++ b/src/testdir/test_tagjump.vim @@ -7,4 +7,20 @@ func Test_ptag_with_notagstack() set tagstack&vim endfunc +func Test_cancel_ptjump() + set tags=Xtags + call writefile(["!_TAG_FILE_ENCODING\tutf-8\t//", + \ "word\tfile1\tcmd1", + \ "word\tfile2\tcmd2"], + \ 'Xtags') + + only! + call feedkeys(":ptjump word\<CR>\<CR>", "xt") + help + call assert_equal(2, winnr('$')) + + call delete('Xtags') + quit +endfunc + " vim: shiftwidth=2 sts=2 expandtab