diff options
| -rw-r--r-- | runtime/doc/eval.txt | 3 | ||||
| -rw-r--r-- | runtime/doc/quickfix.txt | 4 | ||||
| -rwxr-xr-x | scripts/vim-patch.sh | 2 | ||||
| -rw-r--r-- | src/nvim/os/lang.c | 2 | ||||
| -rw-r--r-- | src/nvim/quickfix.c | 11 | ||||
| -rw-r--r-- | src/nvim/testdir/test_quickfix.vim | 33 |
6 files changed, 45 insertions, 10 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 7b5fc191e9..b3ab0a4500 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -6914,7 +6914,8 @@ setqflist({list} [, {action}[, {what}]]) *setqflist()* title quickfix list title text Unsupported keys in {what} are ignored. If the "nr" item is not present, then the current quickfix list - is modified. + is modified. When creating a new quickfix list, "nr" can be + set to a value one greater than the quickfix stack size. Examples: > :call setqflist([], 'r', {'title': 'My search'}) diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt index f280286290..6939dd6836 100644 --- a/runtime/doc/quickfix.txt +++ b/runtime/doc/quickfix.txt @@ -423,7 +423,9 @@ EXECUTE A COMMAND IN ALL THE BUFFERS IN QUICKFIX OR LOCATION LIST: which will indicate the command that produced the quickfix list. This can be used to compose a custom status line if the value of 'statusline' is adjusted - properly. + properly. Whenever this buffer is modified by a + quickfix command or function, the |b:changedtick| + variable is incremented. *:lop* *:lopen* :lop[en] [height] Open a window to show the location list for the diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index 22f946ebd9..59674eb63a 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -244,7 +244,7 @@ stage_patch() { else printf "\nApplying patch...\n" patch -p1 < "${patch_file}" || true - find -name '*.orig' -type f -delete + find . -name '*.orig' -type f -delete fi printf "\nInstructions:\n Proceed to port the patch.\n" else diff --git a/src/nvim/os/lang.c b/src/nvim/os/lang.c index 47c278ee97..6b2a54ddbe 100644 --- a/src/nvim/os/lang.c +++ b/src/nvim/os/lang.c @@ -31,7 +31,7 @@ void lang_init(void) char buf[20] = { 0 }; if (CFStringGetCString(cf_lang_region, buf, 20, kCFStringEncodingUTF8)) { - os_setenv("LANG", lang_region, true); + os_setenv("LANG", buf, true); } } CFRelease(cf_lang_region); diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c index 664dd3e968..4308c4e87e 100644 --- a/src/nvim/quickfix.c +++ b/src/nvim/quickfix.c @@ -1044,10 +1044,12 @@ qf_init_ext( if (newlist || qi->qf_curlist == qi->qf_listcount) { // make place for a new list qf_new_list(qi, qf_title); - } else if (qi->qf_lists[qi->qf_curlist].qf_count > 0) { + } else { // Adding to existing list, use last entry. adding = true; - old_last = qi->qf_lists[qi->qf_curlist].qf_last; + if (qi->qf_lists[qi->qf_curlist].qf_count > 0) { + old_last = qi->qf_lists[qi->qf_curlist].qf_last; + } } // Use the local value of 'errorformat' if it's set. @@ -2885,6 +2887,7 @@ static void qf_update_buffer(qf_info_T *qi, qfline_T *old_last) qf_update_win_titlevar(qi); qf_fill_buffer(qi, buf, old_last); + buf_inc_changedtick(buf); if (old_last == NULL) { (void)qf_win_pos_update(qi, 0); @@ -4209,7 +4212,8 @@ int get_errorlist_properties(win_T *wp, dict_T *what, dict_T *retdict) if (qi->qf_lists[qf_idx].qf_ctx != NULL) { di = tv_dict_item_alloc_len(S_LEN("context")); tv_copy(qi->qf_lists[qf_idx].qf_ctx, &di->di_tv); - if (tv_dict_add(retdict, di) == FAIL) { + status = tv_dict_add(retdict, di); + if (status == FAIL) { tv_dict_item_free(di); } } else { @@ -4398,6 +4402,7 @@ static int qf_set_properties(qf_info_T *qi, dict_T *what, int action) typval_T *ctx = xcalloc(1, sizeof(typval_T)); tv_copy(&di->di_tv, ctx); qi->qf_lists[qf_idx].qf_ctx = ctx; + retval = OK; } return retval; diff --git a/src/nvim/testdir/test_quickfix.vim b/src/nvim/testdir/test_quickfix.vim index 8d2c61f6f0..33abb69ca6 100644 --- a/src/nvim/testdir/test_quickfix.vim +++ b/src/nvim/testdir/test_quickfix.vim @@ -1702,7 +1702,8 @@ func Xproperty_tests(cchar) Xopen wincmd p call g:Xsetlist([{'filename':'foo', 'lnum':27}]) - call g:Xsetlist([], 'a', {'title' : 'Sample'}) + let s = g:Xsetlist([], 'a', {'title' : 'Sample'}) + call assert_equal(0, s) let d = g:Xgetlist({"title":1}) call assert_equal('Sample', d.title) @@ -1756,7 +1757,8 @@ func Xproperty_tests(cchar) endif " Context related tests - call g:Xsetlist([], 'a', {'context':[1,2,3]}) + let s = g:Xsetlist([], 'a', {'context':[1,2,3]}) + call assert_equal(0, s) call test_garbagecollect_now() let d = g:Xgetlist({'context':1}) call assert_equal([1,2,3], d.context) @@ -1821,8 +1823,9 @@ func Xproperty_tests(cchar) " Test for setting/getting items Xexpr "" let qfprev = g:Xgetlist({'nr':0}) - call g:Xsetlist([], ' ', {'title':'Green', + let s = g:Xsetlist([], ' ', {'title':'Green', \ 'items' : [{'filename':'F1', 'lnum':10}]}) + call assert_equal(0, s) let qfcur = g:Xgetlist({'nr':0}) call assert_true(qfcur.nr == qfprev.nr + 1) let l = g:Xgetlist({'items':1}) @@ -2242,3 +2245,27 @@ func Test_resize_from_copen() augroup! QF_Test endtry endfunc + +" Tests for the quickfix buffer b:changedtick variable +func Xchangedtick_tests(cchar) + call s:setup_commands(a:cchar) + + new | only + + Xexpr "" | Xexpr "" | Xexpr "" + + Xopen + Xolder + Xolder + Xaddexpr "F1:10:Line10" + Xaddexpr "F2:20:Line20" + call g:Xsetlist([{"filename":"F3", "lnum":30, "text":"Line30"}], 'a') + call g:Xsetlist([], 'f') + call assert_equal(8, getbufvar('%', 'changedtick')) + Xclose +endfunc + +func Test_changedtick() + call Xchangedtick_tests('c') + call Xchangedtick_tests('l') +endfunc |