diff options
| author | bfredl <bjorn.linse@gmail.com> | 2023-08-21 14:52:17 +0200 |
|---|---|---|
| committer | bfredl <bjorn.linse@gmail.com> | 2023-08-26 12:02:05 +0200 |
| commit | 008154954791001efcc46c28146e21403f3a698b (patch) | |
| tree | 306721ca60456ba9562c16b9d41cf5ec8d5a360c /src/nvim/normal.c | |
| parent | 1635c9e75e21e07c4331cf983e14a11c7e09b119 (diff) | |
| download | rneovim-008154954791001efcc46c28146e21403f3a698b.tar.gz rneovim-008154954791001efcc46c28146e21403f3a698b.tar.bz2 rneovim-008154954791001efcc46c28146e21403f3a698b.zip | |
refactor(change): do API changes to buffer without curbuf switch
Most of the messy things when changing a non-current buffer is
not about the buffer, it is about windows. In particular, it is about
`curwin`.
When editing a non-current buffer which is displayed in some other
window in the current tabpage, one such window will be "borrowed" as the
curwin. But this means if two or more non-current windows displayed the buffers,
one of them will be treated differenty. this is not desirable.
In particular, with nvim_buf_set_text, cursor _column_ position was only
corrected for one single window. Two new tests are added: the test
with just one non-current window passes, but the one with two didn't.
Two corresponding such tests were also added for nvim_buf_set_lines.
This already worked correctly on master, but make sure this is
well-tested for future refactors.
Also, nvim_create_buf no longer invokes autocmds just because you happened
to use `scratch=true`. No option value was changed, therefore OptionSet
must not be fired.
Diffstat (limited to 'src/nvim/normal.c')
| -rw-r--r-- | src/nvim/normal.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/normal.c b/src/nvim/normal.c index 1a220bc962..82b930d2ff 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -3922,7 +3922,7 @@ static void nv_gotofile(cmdarg_T *cap) buf_hide(curbuf) ? ECMD_HIDE : 0, curwin) == OK && cap->nchar == 'F' && lnum >= 0) { curwin->w_cursor.lnum = lnum; - check_cursor_lnum(); + check_cursor_lnum(curwin); beginline(BL_SOL | BL_FIX); } xfree(ptr); @@ -4771,7 +4771,7 @@ static void n_swapchar(cmdarg_T *cap) if (u_savesub(curwin->w_cursor.lnum) == false) { break; } - u_clearline(); + u_clearline(curbuf); } } else { break; @@ -4782,7 +4782,7 @@ static void n_swapchar(cmdarg_T *cap) check_cursor(); curwin->w_set_curswant = true; if (did_change) { - changed_lines(startpos.lnum, startpos.col, curwin->w_cursor.lnum + 1, + changed_lines(curbuf, startpos.lnum, startpos.col, curwin->w_cursor.lnum + 1, 0L, true); curbuf->b_op_start = startpos; curbuf->b_op_end = curwin->w_cursor; @@ -5363,7 +5363,7 @@ static void nv_gi_cmd(cmdarg_T *cap) { if (curbuf->b_last_insert.mark.lnum != 0) { curwin->w_cursor = curbuf->b_last_insert.mark; - check_cursor_lnum(); + check_cursor_lnum(curwin); int i = (int)strlen(get_cursor_line_ptr()); if (curwin->w_cursor.col > (colnr_T)i) { if (virtual_active()) { |