aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/eval/funcs.c
diff options
context:
space:
mode:
authorBjörn Linse <bjorn.linse@gmail.com>2021-09-26 16:56:19 +0200
committerGitHub <noreply@github.com>2021-09-26 16:56:19 +0200
commitd4fa1649fbafe7bedb4bee0b014dd4723ad0ee97 (patch)
tree55324b1771b69ff551677801e328d76215d1d4cd /src/nvim/eval/funcs.c
parentc273eb310098a4ddae577401aca5e07b45107f48 (diff)
parent392c658d4d0f9457f143748adf98ecd4cdc8dc85 (diff)
downloadrneovim-d4fa1649fbafe7bedb4bee0b014dd4723ad0ee97.tar.gz
rneovim-d4fa1649fbafe7bedb4bee0b014dd4723ad0ee97.tar.bz2
rneovim-d4fa1649fbafe7bedb4bee0b014dd4723ad0ee97.zip
Merge pull request #15351 from bfredl/virt_line
feat(screen): virtual lines
Diffstat (limited to 'src/nvim/eval/funcs.c')
-rw-r--r--src/nvim/eval/funcs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c
index e2d485d892..9feecadb6f 100644
--- a/src/nvim/eval/funcs.c
+++ b/src/nvim/eval/funcs.c
@@ -1802,7 +1802,7 @@ static void f_did_filetype(typval_T *argvars, typval_T *rettv, FunPtr fptr)
*/
static void f_diff_filler(typval_T *argvars, typval_T *rettv, FunPtr fptr)
{
- rettv->vval.v_number = diff_check_fill(curwin, tv_get_lnum(argvars));
+ rettv->vval.v_number = MAX(0, diff_check(curwin, tv_get_lnum(argvars)));
}
/*
@@ -10801,7 +10801,7 @@ static void f_strridx(typval_T *argvars, typval_T *rettv, FunPtr fptr)
static void f_strtrans(typval_T *argvars, typval_T *rettv, FunPtr fptr)
{
rettv->v_type = VAR_STRING;
- rettv->vval.v_string = (char_u *)transstr(tv_get_string(&argvars[0]));
+ rettv->vval.v_string = (char_u *)transstr(tv_get_string(&argvars[0]), true);
}
/*