diff options
| author | Sean Dewar <seandewar@users.noreply.github.com> | 2023-08-16 14:17:36 +0100 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-01-23 22:31:55 +0100 |
| commit | 988f74311c26ea9917e84fbae608de226dba7e5f (patch) | |
| tree | 95c475b5966ba8fac1f241e604d437bfed19c693 /src/move.c | |
| parent | 4927110a434e75f8f22188a95b366cfd1fa17e07 (diff) | |
patch 9.1.0047: issues with temp curwin/buf while cmdwin is openv9.1.0047
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)
Alternatively, we could ban win_execute in the cmdwin and audit all places that
temporarily change/restore curwin/buf, but I didn't notice any problems arising
from allowing this (standard cmdwin restrictions still apply, so things that may
actually break the cmdwin are still forbidden).
closes: #12819
Signed-off-by: Sean Dewar <seandewar@users.noreply.github.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
Diffstat (limited to 'src/move.c')
| -rw-r--r-- | src/move.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/move.c b/src/move.c index 861d84b84e..5d2fece63a 100644 --- a/src/move.c +++ b/src/move.c @@ -1067,7 +1067,7 @@ validate_cursor_col(void) win_col_off(win_T *wp) { return (((wp->w_p_nu || wp->w_p_rnu) ? number_width(wp) + 1 : 0) - + (cmdwin_type == 0 || wp != curwin ? 0 : 1) + + (wp != cmdwin_win ? 0 : 1) #ifdef FEAT_FOLDING + wp->w_p_fdc #endif |