diff options
author | Bram Moolenaar <Bram@vim.org> | 2021-02-09 20:02:55 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2021-02-09 20:02:55 +0100 |
commit | 963ffa0a5a6091655ed72b4590ec5d5a1653bce8 (patch) | |
tree | 4d1dd6c2e4e55ce6fb5c3f7dde9aa3b904a91c1c /src/evalbuffer.c | |
parent | a853089479b60b829bab1c4a0a737a073415f8a7 (diff) |
patch 8.2.2489: current buffer is wrong after deletebufline() failsv8.2.2489
Problem: current buffer is wrong after deletebufline() fails to delete a
line in another buffer.
Solution: Restore the current buffer.
Diffstat (limited to 'src/evalbuffer.c')
-rw-r--r-- | src/evalbuffer.c | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/src/evalbuffer.c b/src/evalbuffer.c index 2ba2f679a5..b7aac9a6b1 100644 --- a/src/evalbuffer.c +++ b/src/evalbuffer.c @@ -500,24 +500,25 @@ f_deletebufline(typval_T *argvars, typval_T *rettv) 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) { |