Mercurial > vim
changeset 9982:e24aa20d815c v7.4.2264
commit https://github.com/vim/vim/commit/2b529bb6260b52246e92429375d995b9b5ce76b6
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Aug 27 13:35:35 2016 +0200
patch 7.4.2264
Problem: When adding entries to an empty quickfix list the title is reset.
Solution: Improve handling of the title. (Yegappan Lakshmanan)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 27 Aug 2016 13:45:05 +0200 |
| parents | 9137289034e5 |
| children | 08a32c793dba |
| files | src/quickfix.c src/testdir/test_quickfix.vim src/version.c |
| diffstat | 3 files changed, 25 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/quickfix.c +++ b/src/quickfix.c @@ -4753,11 +4753,15 @@ qf_add_entries( } static int -qf_set_properties(qf_info_T *qi, dict_T *what) +qf_set_properties(qf_info_T *qi, dict_T *what, int action) { dictitem_T *di; int retval = FAIL; int qf_idx; + int newlist = FALSE; + + if (action == ' ' || qi->qf_curlist == qi->qf_listcount) + newlist = TRUE; qf_idx = qi->qf_curlist; /* default is the current list */ if ((di = dict_find(what, (char_u *)"nr", -1)) != NULL) @@ -4771,6 +4775,13 @@ qf_set_properties(qf_info_T *qi, dict_T } else return FAIL; + newlist = FALSE; /* use the specified list */ + } + + if (newlist) + { + qf_new_list(qi, NULL); + qf_idx = qi->qf_curlist; } if ((di = dict_find(what, (char_u *)"title", -1)) != NULL) @@ -4813,7 +4824,7 @@ set_errorlist( } if (what != NULL) - retval = qf_set_properties(qi, what); + retval = qf_set_properties(qi, what, action); else retval = qf_add_entries(qi, list, title, action);
--- a/src/testdir/test_quickfix.vim +++ b/src/testdir/test_quickfix.vim @@ -1527,6 +1527,16 @@ function Xproperty_tests(cchar) call assert_equal('Sample', w:quickfix_title) Xclose + " Tests for action argument + silent! Xolder 999 + let qfnr = g:Xgetlist({'all':1}).nr + call g:Xsetlist([], 'r', {'title' : 'N1'}) + call assert_equal('N1', g:Xgetlist({'all':1}).title) + call g:Xsetlist([], ' ', {'title' : 'N2'}) + call assert_equal(qfnr + 1, g:Xgetlist({'all':1}).nr) + call g:Xsetlist([], ' ', {'title' : 'N3'}) + call assert_equal('N2', g:Xgetlist({'nr':2, 'title':1}).title) + " Invalid arguments call assert_fails('call g:Xgetlist([])', 'E715') call assert_fails('call g:Xsetlist([], "a", [])', 'E715')