patch 9.0.1011: ml_get error when using screenpos()
Problem: ml_get error when using screenpos().
Solution: Give an error for the line number. (closes #11661)
diff --git a/src/move.c b/src/move.c
index 7a9ae3e..954a137 100644
--- a/src/move.c
+++ b/src/move.c
@@ -1500,6 +1500,11 @@
return;
pos.lnum = tv_get_number(&argvars[1]);
+ if (pos.lnum > wp->w_buffer->b_ml.ml_line_count)
+ {
+ semsg(_(e_invalid_line_number_nr), pos.lnum);
+ return;
+ }
pos.col = tv_get_number(&argvars[2]) - 1;
pos.coladd = 0;
textpos2screenpos(wp, &pos, &row, &scol, &ccol, &ecol);
diff --git a/src/testdir/test_cursor_func.vim b/src/testdir/test_cursor_func.vim
index a48db15..8bdc956 100644
--- a/src/testdir/test_cursor_func.vim
+++ b/src/testdir/test_cursor_func.vim
@@ -167,6 +167,9 @@
let pos = screenpos(winid, 1, 66)
call assert_equal(winrow, pos.row)
call assert_equal(wincol + 66 + 3, pos.col)
+
+ call assert_fails('echo screenpos(0, 2, 1)', 'E966:')
+
close
bwipe!
endfunc
diff --git a/src/version.c b/src/version.c
index b8b3460..48bec3d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1011,
+/**/
1010,
/**/
1009,