diff options
| author | Sean Dewar <seandewar@users.noreply.github.com> | 2024-01-28 13:03:56 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-28 13:03:56 +0000 |
| commit | a757195a602bf502fcdb702887bf72f50d6e1717 (patch) | |
| tree | 41f77c24ddfb88b82eaf1c6a5748036276eea2f9 /src/nvim/window.c | |
| parent | 74e695d22715e52f5561a185583b8c23d4fa0dd6 (diff) | |
| parent | d85f180f26c0570c2510c899a0bf0023ec55a692 (diff) | |
| download | rneovim-a757195a602bf502fcdb702887bf72f50d6e1717.tar.gz rneovim-a757195a602bf502fcdb702887bf72f50d6e1717.tar.bz2 rneovim-a757195a602bf502fcdb702887bf72f50d6e1717.zip | |
Merge pull request #24704 from seandewar/cmdwin-madness
vim-patch:9.1.{0047,0048,0049}: fun cmdwin fixes
Diffstat (limited to 'src/nvim/window.c')
| -rw-r--r-- | src/nvim/window.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/nvim/window.c b/src/nvim/window.c index 23779d1e7b..112ac8bf3b 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -2485,7 +2485,7 @@ bool can_close_in_cmdwin(win_T *win, Error *err) FUNC_ATTR_NONNULL_ALL { if (cmdwin_type != 0) { - if (win == curwin) { + if (win == cmdwin_win) { cmdwin_result = Ctrl_C; return false; } else if (win == cmdwin_old_curwin) { @@ -3030,6 +3030,9 @@ void win_free_all(void) { // avoid an error for switching tabpage with the cmdline window open cmdwin_type = 0; + cmdwin_buf = NULL; + cmdwin_win = NULL; + cmdwin_old_curwin = NULL; while (first_tabpage->tp_next != NULL) { tabpage_close(true); |