thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.1.0119: can move away from cmdwin using win_splitmove()

Browse Source 
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>
This commit is contained in:
Sean Dewar
2024-02-20 22:05:10 +01:00
committed by Christian Brabandt
parent 704966c254
commit f865895c87
3 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/evalwindow.c
View File

@@ -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)

28
src/testdir/test_window_cmd.vim
View File

@@ -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

2
src/version.c
View File

@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
119,
/**/
118,
/**/