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/textformat.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/textformat.c')
| -rw-r--r-- | src/nvim/textformat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nvim/textformat.c b/src/nvim/textformat.c index 64cccf5f3f..bfe3ed5972 100644 --- a/src/nvim/textformat.c +++ b/src/nvim/textformat.c @@ -763,7 +763,7 @@ int comp_textwidth(bool ff) // The width is the window width minus 'wrapmargin' minus all the // things that add to the margin. textwidth = curwin->w_width_inner - (int)curbuf->b_p_wm; - if (cmdwin_type != 0) { + if (curbuf == cmdwin_buf) { textwidth -= 1; } textwidth -= win_fdccol_count(curwin); |