patch 8.2.2489: current buffer is wrong after deletebufline() fails
Problem: current buffer is wrong after deletebufline() fails to delete a
line in another buffer.
Solution: Restore the current buffer.
diff --git a/src/evalbuffer.c b/src/evalbuffer.c
index 2ba2f67..b7aac9a 100644
--- a/src/evalbuffer.c
+++ b/src/evalbuffer.c
@@ -500,24 +500,25 @@
if (u_save(first - 1, last + 1) == FAIL)
{
rettv->vval.v_number = 1; // FAIL
- return;
}
+ else
+ {
+ for (lnum = first; lnum <= last; ++lnum)
+ ml_delete_flags(first, ML_DEL_MESSAGE);
- for (lnum = first; lnum <= last; ++lnum)
- ml_delete_flags(first, ML_DEL_MESSAGE);
-
- FOR_ALL_TAB_WINDOWS(tp, wp)
- if (wp->w_buffer == buf)
- {
- if (wp->w_cursor.lnum > last)
- wp->w_cursor.lnum -= count;
- else if (wp->w_cursor.lnum> first)
- wp->w_cursor.lnum = first;
- if (wp->w_cursor.lnum > wp->w_buffer->b_ml.ml_line_count)
- wp->w_cursor.lnum = wp->w_buffer->b_ml.ml_line_count;
- }
- check_cursor_col();
- deleted_lines_mark(first, count);
+ FOR_ALL_TAB_WINDOWS(tp, wp)
+ if (wp->w_buffer == buf)
+ {
+ if (wp->w_cursor.lnum > last)
+ wp->w_cursor.lnum -= count;
+ else if (wp->w_cursor.lnum> first)
+ wp->w_cursor.lnum = first;
+ if (wp->w_cursor.lnum > wp->w_buffer->b_ml.ml_line_count)
+ wp->w_cursor.lnum = wp->w_buffer->b_ml.ml_line_count;
+ }
+ check_cursor_col();
+ deleted_lines_mark(first, count);
+ }
if (!is_curbuf)
{
diff --git a/src/testdir/test_bufline.vim b/src/testdir/test_bufline.vim
index 5df5288..04653ba 100644
--- a/src/testdir/test_bufline.vim
+++ b/src/testdir/test_bufline.vim
@@ -186,6 +186,17 @@
call assert_equal(0, deletebufline(b, 1))
call assert_equal(['b', 'c'], getbufline(b, 1, 2))
exe "bwipe! " . b
+
+ edit XbufOne
+ let one = bufnr()
+ call setline(1, ['a', 'b', 'c'])
+ setlocal nomodifiable
+ split XbufTwo
+ let two = bufnr()
+ call assert_fails('call deletebufline(one, 1)', 'E21:')
+ call assert_equal(two, bufnr())
+ bwipe! XbufTwo
+ bwipe! XbufOne
endfunc
func Test_appendbufline_redraw()
diff --git a/src/version.c b/src/version.c
index 8b5de13..18f0b84 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2489,
+/**/
2488,
/**/
2487,