diff options
| -rw-r--r-- | src/nvim/quickfix.c | 14 | ||||
| -rw-r--r-- | src/nvim/testdir/test_quickfix.vim | 10 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
3 files changed, 23 insertions, 3 deletions
diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c index 40a8066f75..7f5e5a481b 100644 --- a/src/nvim/quickfix.c +++ b/src/nvim/quickfix.c @@ -4214,11 +4214,15 @@ static int qf_add_entries(qf_info_T *qi, list_T *list, char_u *title, return retval; } -static int qf_set_properties(qf_info_T *qi, dict_T *what) +static int qf_set_properties(qf_info_T *qi, dict_T *what, int action) { dictitem_T *di; int retval = FAIL; + int newlist = false; + if (action == ' ' || qi->qf_curlist == qi->qf_listcount) { + newlist = true; + } int qf_idx = qi->qf_curlist; // default is the current list if ((di = dict_find(what, (char_u *)"nr", -1)) != NULL) { // Use the specified quickfix/location list @@ -4230,6 +4234,12 @@ static int qf_set_properties(qf_info_T *qi, dict_T *what) } 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) { @@ -4260,7 +4270,7 @@ int set_errorlist(win_T *wp, list_T *list, int action, char_u *title, } 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); } diff --git a/src/nvim/testdir/test_quickfix.vim b/src/nvim/testdir/test_quickfix.vim index 044c288ce0..1f4a39b853 100644 --- a/src/nvim/testdir/test_quickfix.vim +++ b/src/nvim/testdir/test_quickfix.vim @@ -1508,6 +1508,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') diff --git a/src/nvim/version.c b/src/nvim/version.c index e3da66af05..731d22d779 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -176,7 +176,7 @@ static int included_patches[] = { // 2267 NA // 2266, 2265, - // 2264, + 2264, // 2263, // 2262 NA // 2261 NA |