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/drawline.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/drawline.c')
| -rw-r--r-- | src/nvim/drawline.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/drawline.c b/src/nvim/drawline.c index 0dd8d6398b..0b88c307c7 100644 --- a/src/nvim/drawline.c +++ b/src/nvim/drawline.c @@ -1219,7 +1219,7 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, int col_rows, s statuscol.draw = true; statuscol.sattrs = wlv.sattrs; statuscol.foldinfo = foldinfo; - statuscol.width = win_col_off(wp) - (cmdwin_type != 0 && wp == curwin); + statuscol.width = win_col_off(wp) - (wp == cmdwin_win); statuscol.use_cul = use_cursor_line_highlight(wp, lnum); statuscol.sign_cul_id = statuscol.use_cul ? sign_cul_attr : 0; statuscol.num_attr = sign_num_attr > 0 ? syn_id2attr(sign_num_attr) : 0; @@ -1511,7 +1511,7 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, int col_rows, s assert(wlv.off == 0); - if (cmdwin_type != 0 && wp == curwin) { + if (wp == cmdwin_win) { // Draw the cmdline character. draw_col_fill(&wlv, schar_from_ascii(cmdwin_type), 1, win_hl_attr(wp, HLF_AT)); } |