Mercurial > vim
changeset 9540:64a791c53418 v7.4.2050
commit https://github.com/vim/vim/commit/015102e91e978a0bb42a14461c132a85e8f7e1ea
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jul 16 18:24:56 2016 +0200
patch 7.4.2050
Problem: When using ":vimgrep" may end up with duplicate buffers.
Solution: When adding an error list entry pass the buffer number if possible.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 16 Jul 2016 18:45:04 +0200 |
| parents | 3bc6d72454fc |
| children | ece716527680 |
| files | src/quickfix.c src/testdir/test_quickfix.vim src/version.c |
| diffstat | 3 files changed, 27 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/quickfix.c +++ b/src/quickfix.c @@ -1581,7 +1581,7 @@ static char_u *qf_last_bufname = NULL; static bufref_T qf_last_bufref = {NULL, 0}; /* - * Get buffer number for file "dir.name". + * Get buffer number for file "directory.fname". * Also sets the b_has_qf_entry flag. */ static int @@ -4109,11 +4109,13 @@ ex_vimgrep(exarg_T *eap) while (vim_regexec_multi(®match, curwin, buf, lnum, col, NULL) > 0) { - ; + /* Pass the buffer number so that it gets used even for a + * dummy buffer, unless duplicate_name is set, then the + * buffer will be wiped out below. */ if (qf_add_entry(qi, NULL, /* dir */ fname, - 0, + duplicate_name ? 0 : buf->b_fnum, ml_get_buf(buf, regmatch.startpos[0].lnum + lnum, FALSE), regmatch.startpos[0].lnum + lnum, @@ -4177,12 +4179,17 @@ ex_vimgrep(exarg_T *eap) else if (buf != first_match_buf || (flags & VGR_NOJUMP)) { unload_dummy_buffer(buf, dirname_start); + /* Keeping the buffer, remove the dummy flag. */ + buf->b_flags &= ~BF_DUMMY; buf = NULL; } } if (buf != NULL) { + /* Keeping the buffer, remove the dummy flag. */ + buf->b_flags &= ~BF_DUMMY; + /* If the buffer is still loaded we need to use the * directory we jumped to below. */ if (buf == first_match_buf
--- a/src/testdir/test_quickfix.vim +++ b/src/testdir/test_quickfix.vim @@ -1462,3 +1462,18 @@ func Test_history() call HistoryTest('c') call HistoryTest('l') endfunc + +func Test_duplicate_buf() + " make sure we can get the highest buffer number + edit DoesNotExist + edit DoesNotExist2 + let last_buffer = bufnr("$") + + " make sure only one buffer is created + call writefile(['this one', 'that one'], 'Xgrepthis') + vimgrep one Xgrepthis + vimgrep one Xgrepthis + call assert_equal(last_buffer + 1, bufnr("$")) + + call delete('Xgrepthis') +endfunc