diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-04-08 17:01:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-08 17:01:16 +0200 |
| commit | fd4b34af471b3ec485ad82d8e7c47b09d7e90a48 (patch) | |
| tree | 1f83acdac4c61866ac59f22fabe0d8d77597ed7b /src/nvim/eval.c | |
| parent | 13352c00f1909d9296c5f276a3735f5e6f231b39 (diff) | |
| parent | 123931e65e8f6ca3ac13fff8279720c8328a018e (diff) | |
| download | rneovim-fd4b34af471b3ec485ad82d8e7c47b09d7e90a48.tar.gz rneovim-fd4b34af471b3ec485ad82d8e7c47b09d7e90a48.tar.bz2 rneovim-fd4b34af471b3ec485ad82d8e7c47b09d7e90a48.zip | |
Merge #6473 from jamessan/vim-8.0.0499
vim-patch:8.0.0499,8.0.0550
Diffstat (limited to 'src/nvim/eval.c')
| -rw-r--r-- | src/nvim/eval.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 1636b490d5..124d6acfe9 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -8728,10 +8728,10 @@ static void f_foldtextresult(typval_T *argvars, typval_T *rettv, FunPtr fptr) } fold_count = foldedCount(curwin, lnum, &foldinfo); if (fold_count > 0) { - text = get_foldtext(curwin, lnum, lnum + fold_count - 1, - &foldinfo, buf); - if (text == buf) + text = get_foldtext(curwin, lnum, lnum + fold_count - 1, &foldinfo, buf); + if (text == buf) { text = vim_strsave(text); + } rettv->vval.v_string = text; } } @@ -16436,7 +16436,12 @@ static void f_taglist(typval_T *argvars, typval_T *rettv, FunPtr fptr) return; } - (void)get_tags(tv_list_alloc_ret(rettv), (char_u *)tag_pattern); + const char *fname = NULL; + if (argvars[1].v_type != VAR_UNKNOWN) { + fname = tv_get_string(&argvars[1]); + } + (void)get_tags(tv_list_alloc_ret(rettv), (char_u *)tag_pattern, + (char_u *)fname); } /* |