Mercurial > vim
changeset 20764:3c61d8ec36af v8.2.0934
patch 8.2.0934: lhelpgrep twice in help window doesn't jump to the help topic
Commit: https://github.com/vim/vim/commit/ec98e93a82379ca9289d8021aec374aa6798afef
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Jun 8 19:35:59 2020 +0200
patch 8.2.0934: lhelpgrep twice in help window doesn't jump to the help topic
Problem: Running lhelpgrep twice in a help window doesn't jump to the help
topic.
Solution: Check whether any window with the location list is present.
(Yegappan Lakshmanan, closes #6215)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 08 Jun 2020 19:45:04 +0200 |
| parents | 10eb3da35cd6 |
| children | ca776ec54a6c |
| files | src/quickfix.c src/testdir/test_quickfix.vim src/version.c |
| diffstat | 3 files changed, 23 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/quickfix.c +++ b/src/quickfix.c @@ -7963,9 +7963,10 @@ ex_helpgrep(exarg_T *eap) { apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name, curbuf->b_fname, TRUE, curbuf); - if (!new_qi && IS_LL_STACK(qi) && qf_find_buf(qi) == NULL) + // When adding a location list to an existing location list stack, + // if the autocmd made the stack invalid, then just return. + if (!new_qi && IS_LL_STACK(qi) && qf_find_win_with_loclist(qi) == NULL) { - // autocommands made "qi" invalid decr_quickfix_busy(); return; }
--- a/src/testdir/test_quickfix.vim +++ b/src/testdir/test_quickfix.vim @@ -4918,4 +4918,22 @@ func Test_qftextfunc() call Xtest_qftextfunc('l') endfunc +" Running :lhelpgrep command more than once in a help window, doesn't jump to +" the help topic +func Test_lhelpgrep_from_help_window() + call mkdir('Xtestdir/doc', 'p') + call writefile(['window'], 'Xtestdir/doc/a.txt') + call writefile(['buffer'], 'Xtestdir/doc/b.txt') + let save_rtp = &rtp + let &rtp = 'Xtestdir' + lhelpgrep window + lhelpgrep buffer + call assert_equal('b.txt', fnamemodify(@%, ":p:t")) + lhelpgrep window + call assert_equal('a.txt', fnamemodify(@%, ":p:t")) + let &rtp = save_rtp + call delete('Xtestdir', 'rf') + new | only! +endfunc + " vim: shiftwidth=2 sts=2 expandtab