diff options
| author | Sean Dewar <seandewar@users.noreply.github.com> | 2023-07-27 01:38:23 +0100 |
|---|---|---|
| committer | Sean Dewar <seandewar@users.noreply.github.com> | 2024-01-28 12:29:26 +0000 |
| commit | cf140fb25b94c556396fe942a4af3e8db9effa37 (patch) | |
| tree | ad454e6616d049d60b18d11929c16bfb0af52003 /src/nvim/move.c | |
| parent | 2cd76a758b4511748d9482e5af58162a608516b4 (diff) | |
| download | rneovim-cf140fb25b94c556396fe942a4af3e8db9effa37.tar.gz rneovim-cf140fb25b94c556396fe942a4af3e8db9effa37.tar.bz2 rneovim-cf140fb25b94c556396fe942a4af3e8db9effa37.zip | |
vim-patch:9.1.0047: issues with temp curwin/buf while cmdwin is open
Problem: Things that temporarily change/restore curwin/buf (e.g:
win_execute, some autocmds) may break assumptions that
curwin/buf is the cmdwin when "cmdwin_type != 0", causing
issues.
Solution: Expose the cmdwin's real win/buf and check that instead. Also
try to ensure these variables are NULL if "cmdwin_type == 0",
allowing them to be used directly in most cases without
checking cmdwin_type. (Sean Dewar)
Reset and save `cmdwin_old_curwin` in a similar fashion.
Apply suitable changes for API functions and add Lua tests.
https://github.com/vim/vim/commit/988f74311c26ea9917e84fbae608de226dba7e5f
Diffstat (limited to 'src/nvim/move.c')
| -rw-r--r-- | src/nvim/move.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nvim/move.c b/src/nvim/move.c index a7380577c4..a303d1757f 100644 --- a/src/nvim/move.c +++ b/src/nvim/move.c @@ -760,7 +760,7 @@ int win_col_off(win_T *wp) { return ((wp->w_p_nu || wp->w_p_rnu || *wp->w_p_stc != NUL) ? (number_width(wp) + (*wp->w_p_stc == NUL)) : 0) - + ((cmdwin_type == 0 || wp != curwin) ? 0 : 1) + + ((wp != cmdwin_win) ? 0 : 1) + win_fdccol_count(wp) + (wp->w_scwidth * SIGN_WIDTH); } |