patch 9.1.0119: can move away from cmdwin using win_splitmove()
Problem: can switch windows while textlocked via f_win_gotoid and
f_win_splitmove (which also allows switching in the cmdwin).
Solution: Check text_or_buf_locked in f_win_splitmove()
(Sean Dewar)
While at it, call text_or_buf_locked() in f_win_gotoid() instead of
testing for cmdwin_type() (which text_buf_locked() does and
in addition will also verify that the buffer is not locked).
closes: #14042
Signed-off-by: Sean Dewar <6256228+seandewar@users.noreply.github.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/src/evalwindow.c b/src/evalwindow.c
index 5016eb4..00081d4 100644
--- a/src/evalwindow.c
+++ b/src/evalwindow.c
@@ -824,11 +824,8 @@
return;
id = tv_get_number(&argvars[0]);
- if (cmdwin_type != 0)
- {
- emsg(_(e_invalid_in_cmdline_window));
+ if (text_or_buf_locked())
return;
- }
#if defined(FEAT_PROP_POPUP) && defined(FEAT_TERMINAL)
if (popup_is_popup(curwin) && curbuf->b_term != NULL)
{
@@ -998,7 +995,7 @@
}
// Check if we can split the target before we bother switching windows.
- if (check_split_disallowed(targetwin) == FAIL)
+ if (text_or_buf_locked() || check_split_disallowed(targetwin) == FAIL)
return;
if (curwin != targetwin)