patch 8.1.0511: ml_get error when calling a function with a range
Problem: ml_get error when calling a function with a range.
Solution: Don't position the cursor after the last line.
diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index e59cdf8..ac8a27f 100644
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -1119,3 +1119,22 @@
call assert_fails('call Fsandbox()', 'E48:')
delfunc Fsandbox
endfunc
+
+func EditAnotherFile()
+ let word = expand('<cword>')
+ edit Xfuncrange2
+endfunc
+
+func Test_func_range_with_edit()
+ " Define a function that edits another buffer, then call it with a range that
+ " is invalid in that buffer.
+ call writefile(['just one line'], 'Xfuncrange2')
+ new
+ call setline(1, range(10))
+ write Xfuncrange1
+ call assert_fails('5,8call EditAnotherFile()', 'E16:')
+
+ call delete('Xfuncrange1')
+ call delete('Xfuncrange2')
+ bwipe!
+endfunc
diff --git a/src/userfunc.c b/src/userfunc.c
index 7c3b7f6..f79e7f1 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -3149,6 +3149,13 @@
{
if (!eap->skip && eap->addr_count > 0)
{
+ if (lnum > curbuf->b_ml.ml_line_count)
+ {
+ // If the function deleted lines or switched to another buffer
+ // the line number may become invalid.
+ EMSG(_(e_invrange));
+ break;
+ }
curwin->w_cursor.lnum = lnum;
curwin->w_cursor.col = 0;
#ifdef FEAT_VIRTUALEDIT
diff --git a/src/version.c b/src/version.c
index a5b6d87..8440ce9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -793,6 +793,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 511,
+/**/
510,
/**/
509,