diff options
| author | Sean Dewar <6256228+seandewar@users.noreply.github.com> | 2024-02-20 22:05:10 +0100 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-02-20 22:05:10 +0100 |
| commit | f865895c874b0936b0563ebfef7490aac8cb8a1f (patch) | |
| tree | 0fbc88c23ac8df82c63b38b59c763438c8348b68 /src | |
| parent | 704966c2545897dfcf426dd9ef946aeb6fa80c38 (diff) | |
patch 9.1.0119: can move away from cmdwin using win_splitmove()v9.1.0119
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/evalwindow.c | 7 | ||||
| -rw-r--r-- | src/testdir/test_window_cmd.vim | 28 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 32 insertions, 5 deletions
diff --git a/src/evalwindow.c b/src/evalwindow.c index 5016eb4588..00081d43d5 100644 --- a/src/evalwindow.c +++ b/src/evalwindow.c @@ -824,11 +824,8 @@ f_win_gotoid(typval_T *argvars, typval_T *rettv) 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 @@ f_win_splitmove(typval_T *argvars, typval_T *rettv) } // 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) diff --git a/src/testdir/test_window_cmd.vim b/src/testdir/test_window_cmd.vim index 5b50f9dc5d..ff4ab845ef 100644 --- a/src/testdir/test_window_cmd.vim +++ b/src/testdir/test_window_cmd.vim @@ -2225,4 +2225,32 @@ func Test_splitmove_autocmd_window_no_room() %bw! endfunc +func Test_win_gotoid_splitmove_textlock_cmdwin() + call setline(1, 'foo') + new + let curwin = win_getid() + call setline(1, 'bar') + + set debug+=throw indentexpr=win_gotoid(win_getid(winnr('#'))) + call assert_fails('normal! ==', 'E565:') + call assert_equal(curwin, win_getid()) + + set indentexpr=win_splitmove(winnr('#'),winnr()) + call assert_fails('normal! ==', 'E565:') + call assert_equal(curwin, win_getid()) + + %bw! + set debug-=throw indentexpr& + + call feedkeys('q:' + \ .. ":call assert_fails('call win_splitmove(winnr(''#''), winnr())', 'E11:')\<CR>" + \ .. ":call assert_equal('command', win_gettype())\<CR>" + \ .. ":call assert_equal('', win_gettype(winnr('#')))\<CR>", 'ntx') + + call feedkeys('q:' + \ .. ":call assert_fails('call win_gotoid(win_getid(winnr(''#'')))', 'E11:')\<CR>" + \ .. ":call assert_equal('command', win_gettype())\<CR>" + \ .. ":call assert_equal('', win_gettype(winnr('#')))\<CR>", 'ntx') +endfunc + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index 7de75e35b6..f3d8fd8d1d 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 119, +/**/ 118, /**/ 117, |