Mercurial > vim
changeset 34385:2f1489b02823 v9.1.0119
patch 9.1.0119: can move away from cmdwin using win_splitmove()
Commit: https://github.com/vim/vim/commit/f865895c874b0936b0563ebfef7490aac8cb8a1f
Author: Sean Dewar <6256228+seandewar@users.noreply.github.com>
Date: Tue Feb 20 22:05:10 2024 +0100
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>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 20 Feb 2024 22:30:08 +0100 |
| parents | 1e826423694b |
| children | d9a589d77d3e |
| files | src/evalwindow.c src/testdir/test_window_cmd.vim src/version.c |
| diffstat | 3 files changed, 32 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/evalwindow.c +++ b/src/evalwindow.c @@ -824,11 +824,8 @@ f_win_gotoid(typval_T *argvars, typval_T 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, typva } // 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)
--- a/src/testdir/test_window_cmd.vim +++ b/src/testdir/test_window_cmd.vim @@ -2225,4 +2225,32 @@ func Test_splitmove_autocmd_window_no_ro %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