diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-11-04 23:39:38 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-11-04 23:39:38 +0100 |
| commit | 9e353b5265bd7fa103caf4e5a9b3c99f344f548e (patch) | |
| tree | f160112f470bdd7d72e902ae6d185ce442e27cc3 | |
| parent | ba3ff539303c7bb6e46a6802dce3c7b2e55284e0 (diff) | |
patch 8.1.0511: ml_get error when calling a function with a rangev8.1.0511
Problem: ml_get error when calling a function with a range.
Solution: Don't position the cursor after the last line.
| -rw-r--r-- | src/testdir/test_functions.vim | 19 | ||||
| -rw-r--r-- | src/userfunc.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 28 insertions, 0 deletions
diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim index e59cdf82a3..ac8a27f75a 100644 --- a/src/testdir/test_functions.vim +++ b/src/testdir/test_functions.vim @@ -1119,3 +1119,22 @@ func Test_func_sandbox() 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 7c3b7f673a..f79e7f1755 100644 --- a/src/userfunc.c +++ b/src/userfunc.c @@ -3149,6 +3149,13 @@ ex_call(exarg_T *eap) { 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 a5b6d877b8..8440ce9401 100644 --- a/src/version.c +++ b/src/version.c @@ -793,6 +793,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 511, +/**/ 510, /**/ 509, |