Mercurial > vim
diff src/evalfunc.c @ 11225:d3415ec1cdaf v8.0.0499
patch 8.0.0499: taglist() does not prioritize tags for a buffer
commit https://github.com/vim/vim/commit/c6aafbaf3ea755e3ab4ee2e3045911126a08b038
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Mar 21 17:09:10 2017 +0100
patch 8.0.0499: taglist() does not prioritize tags for a buffer
Problem: taglist() does not prioritize tags for a buffer.
Solution: Add an optional buffer argument. (Duncan McDougall, closes https://github.com/vim/vim/issues/1194)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 21 Mar 2017 17:15:05 +0100 |
| parents | 2e4877acfe0a |
| children | 918942a3b0ef |
line wrap: on
line diff
--- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -824,7 +824,7 @@ static struct fst {"tabpagenr", 0, 1, f_tabpagenr}, {"tabpagewinnr", 1, 2, f_tabpagewinnr}, {"tagfiles", 0, 0, f_tagfiles}, - {"taglist", 1, 1, f_taglist}, + {"taglist", 1, 2, f_taglist}, #ifdef FEAT_FLOAT {"tan", 1, 1, f_tan}, {"tanh", 1, 1, f_tanh}, @@ -3589,7 +3589,8 @@ f_foldtextresult(typval_T *argvars UNUSE fold_count = foldedCount(curwin, lnum, &foldinfo); if (fold_count > 0) { - text = get_foldtext(curwin, lnum, lnum + fold_count - 1, &foldinfo, buf); + text = get_foldtext(curwin, lnum, lnum + fold_count - 1, + &foldinfo, buf); if (text == buf) text = vim_strsave(text); rettv->vval.v_string = text; @@ -12267,6 +12268,7 @@ f_tagfiles(typval_T *argvars UNUSED, typ static void f_taglist(typval_T *argvars, typval_T *rettv) { + char_u *fname = NULL; char_u *tag_pattern; tag_pattern = get_tv_string(&argvars[0]); @@ -12275,8 +12277,10 @@ f_taglist(typval_T *argvars, typval_T *r if (*tag_pattern == NUL) return; + if (argvars[1].v_type != VAR_UNKNOWN) + fname = get_tv_string(&argvars[1]); if (rettv_list_alloc(rettv) == OK) - (void)get_tags(rettv->vval.v_list, tag_pattern); + (void)get_tags(rettv->vval.v_list, tag_pattern, fname); } /*