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/evalwindow.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/evalwindow.c')
-rw-r--r-- | src/evalwindow.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/evalwindow.c b/src/evalwindow.c index fde90f2561..7d035d53b0 100644 --- a/src/evalwindow.c +++ b/src/evalwindow.c @@ -1076,7 +1076,7 @@ f_win_gettype(typval_T *argvars, typval_T *rettv) else if (WIN_IS_POPUP(wp)) rettv->vval.v_string = vim_strsave((char_u *)"popup"); #endif - else if (wp == curwin && cmdwin_type != 0) + else if (wp == cmdwin_win) rettv->vval.v_string = vim_strsave((char_u *)"command"); #ifdef FEAT_QUICKFIX else if (bt_quickfix(wp->w_buffer)) |