diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2024-04-27 06:32:25 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-27 06:32:25 +0800 |
| commit | 435dee74bb3593b778328138dac054f26e2d7396 (patch) | |
| tree | 910bc6fc525253fa2b4d5e777f839c60e4219170 | |
| parent | 694756252b057ceb72b86f3418f3e4cb227a17ba (diff) | |
| download | rneovim-435dee74bb3593b778328138dac054f26e2d7396.tar.gz rneovim-435dee74bb3593b778328138dac054f26e2d7396.tar.bz2 rneovim-435dee74bb3593b778328138dac054f26e2d7396.zip | |
vim-patch:9.1.0374: wrong botline in BufEnter (#28530)
Problem: When :edit an existing buffer, line('w$') may return a
wrong result.
Solution: Reset w_valid in curwin_init() (Jaehwang Jung)
`do_ecmd()` reinitializes the current window (`curwin_init()`) whose
`w_valid` field may have `VALID_BOTLINE` set. Resetting `w_botline`
without marking it as invalid makes subsequent `validate_botline()`
calls a no-op, thus resulting in wrong `line('w$')` value.
closes: vim/vim#14642
https://github.com/vim/vim/commit/eb80b8304efb6dfeaa8d01dd41fe281df4894240
Co-authored-by: Jaehwang Jung <tomtomjhj@gmail.com>
| -rw-r--r-- | src/nvim/buffer_defs.h | 4 | ||||
| -rw-r--r-- | src/nvim/window.c | 1 | ||||
| -rw-r--r-- | test/old/testdir/test_autocmd.vim | 12 |
3 files changed, 15 insertions, 2 deletions
diff --git a/src/nvim/buffer_defs.h b/src/nvim/buffer_defs.h index 083508fe86..512247047c 100644 --- a/src/nvim/buffer_defs.h +++ b/src/nvim/buffer_defs.h @@ -47,8 +47,8 @@ typedef struct { #define VALID_VIRTCOL 0x04 // w_virtcol (file col) is valid #define VALID_CHEIGHT 0x08 // w_cline_height and w_cline_folded valid #define VALID_CROW 0x10 // w_cline_row is valid -#define VALID_BOTLINE 0x20 // w_botine and w_empty_rows are valid -#define VALID_BOTLINE_AP 0x40 // w_botine is approximated +#define VALID_BOTLINE 0x20 // w_botline and w_empty_rows are valid +#define VALID_BOTLINE_AP 0x40 // w_botline is approximated #define VALID_TOPLINE 0x80 // w_topline is valid (for cursor position) // flags for b_flags diff --git a/src/nvim/window.c b/src/nvim/window.c index 8232767e20..1a6c3f7263 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -2467,6 +2467,7 @@ void win_init_empty(win_T *wp) wp->w_topline = 1; wp->w_topfill = 0; wp->w_botline = 2; + wp->w_valid = 0; wp->w_s = &wp->w_buffer->b_s; } diff --git a/test/old/testdir/test_autocmd.vim b/test/old/testdir/test_autocmd.vim index 7a9799107a..ddc595e116 100644 --- a/test/old/testdir/test_autocmd.vim +++ b/test/old/testdir/test_autocmd.vim @@ -4105,4 +4105,16 @@ func Test_SwapExists_set_other_buf_modified() bwipe! endfunc +func Test_BufEnter_botline() + set hidden + call writefile(range(10), 'Xxx1', 'D') + call writefile(range(20), 'Xxx2', 'D') + edit Xxx1 + edit Xxx2 + au BufEnter Xxx1 call assert_true(line('w$') > 1) + edit Xxx1 + au! BufEnter Xxx1 + set hidden&vim +endfunc + " vim: shiftwidth=2 sts=2 expandtab |