summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/typval.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/typval.c b/src/typval.c
index ca561ddbf..cf1208d58 100644
--- a/src/typval.c
+++ b/src/typval.c
@@ -1621,11 +1621,12 @@ tv_get_lnum(typval_T *argvars)
if (argvars[0].v_type != VAR_STRING || !in_vim9script())
lnum = (linenr_T)tv_get_number_chk(&argvars[0], NULL);
- if (lnum < 0) // no valid number, try using arg like line()
+ if (lnum <= 0 && argvars[0].v_type != VAR_NUMBER)
{
int fnum;
pos_T *fp = var2fpos(&argvars[0], TRUE, &fnum, FALSE);
+ // no valid number, try using arg like line()
if (fp != NULL)
lnum = fp->lnum;
}
diff --git a/src/version.c b/src/version.c
index 1f389e9ef..1937de121 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2671,
+/**/
2670,
/**/
2669,