]> granicus.if.org Git - vim/commitdiff
patch 8.2.2671: error for line number in legacy script v8.2.2671
authorBram Moolenaar <Bram@vim.org>
Sun, 28 Mar 2021 14:26:41 +0000 (16:26 +0200)
committerBram Moolenaar <Bram@vim.org>
Sun, 28 Mar 2021 14:26:41 +0000 (16:26 +0200)
Problem:    Error for line number in legacy script.
Solution:   Check for number type.

src/typval.c
src/version.c

index ca561ddbf7b40e4a573fb78bbb2242bbf5a7d2f4..cf1208d58670c4acb7c26cae9d158f60e734187d 100644 (file)
@@ -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;
     }
index 1f389e9ef74a721696c50fb5c2512233e6ac5459..1937de1217dd066d06afa0bd19db96478a9ec875 100644 (file)
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2671,
 /**/
     2670,
 /**/