diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-01-29 23:11:25 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-01-29 23:11:25 +0100 |
| commit | c593fee0e5e850f7e75be41f5d1751f28892a27f (patch) | |
| tree | a6e824414c142e87462da80b0945242fcbbc4ebd | |
| parent | 85b5743d3e69f96882b6124d4b4ebf873ca24707 (diff) | |
patch 8.0.0270: may get ml_get error when :rubydo deletes linesv8.0.0270
Problem: May get ml_get error when :rubydo deletes lines or switches to
another buffer. (Nikolai Pavlov, issue #1421)
Solution: Check the buffer and line every time.
| -rw-r--r-- | src/if_ruby.c | 5 | ||||
| -rw-r--r-- | src/testdir/test_ruby.vim | 17 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 24 insertions, 0 deletions
diff --git a/src/if_ruby.c b/src/if_ruby.c index afa27abe2c..02b59dd14a 100644 --- a/src/if_ruby.c +++ b/src/if_ruby.c @@ -783,6 +783,7 @@ void ex_rubydo(exarg_T *eap) { int state; linenr_T i; + buf_T *was_curbuf = curbuf; if (ensure_ruby_initialized()) { @@ -792,6 +793,8 @@ void ex_rubydo(exarg_T *eap) { VALUE line; + if (i > curbuf->b_ml.ml_line_count) + break; line = vim_str2rb_enc_str((char *)ml_get(i)); rb_lastline_set(line); eval_enc_string_protect((char *) eap->arg, &state); @@ -800,6 +803,8 @@ void ex_rubydo(exarg_T *eap) error_print(state); break; } + if (was_curbuf != curbuf) + break; line = rb_lastline_get(); if (!NIL_P(line)) { diff --git a/src/testdir/test_ruby.vim b/src/testdir/test_ruby.vim index 106ccb48c3..174467f71f 100644 --- a/src/testdir/test_ruby.vim +++ b/src/testdir/test_ruby.vim @@ -32,3 +32,20 @@ func Test_ruby_evaluate_dict() redir END call assert_equal(['{"a"=>"foo", "b"=>123}'], split(l:out, "\n")) endfunc + +func Test_rubydo() + " Check deleting lines does not trigger ml_get error. + new + call setline(1, ['one', 'two', 'three']) + rubydo Vim.command("%d_") + bwipe! + + " Check switching to another buffer does not trigger ml_get error. + new + let wincount = winnr('$') + call setline(1, ['one', 'two', 'three']) + rubydo Vim.command("new") + call assert_equal(wincount + 1, winnr('$')) + bwipe! + bwipe! +endfunc diff --git a/src/version.c b/src/version.c index 476074f6b2..44e5b6fb57 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 270, +/**/ 269, /**/ 268, |