mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-04 08:56:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-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).

f865895c87
This commit is contained in:
Sean Dewar
2024-02-25 01:11:40 +00:00
parent 1c6b693ec1
commit 01b27410a3
2 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/eval/window.c
View File

@@ -14,6 +14,7 @@
#include "nvim/eval/typval.h" #include "nvim/eval/typval.h"
#include "nvim/eval/typval_defs.h" #include "nvim/eval/typval_defs.h"
#include "nvim/eval/window.h" #include "nvim/eval/window.h"
#include "nvim/ex_getln.h"
#include "nvim/garray.h" #include "nvim/garray.h"
#include "nvim/garray_defs.h" #include "nvim/garray_defs.h"
#include "nvim/gettext_defs.h" #include "nvim/gettext_defs.h"
@@ -584,8 +585,7 @@ void f_win_gotoid(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
{ {
int id = (int)tv_get_number(&argvars[0]); int id = (int)tv_get_number(&argvars[0]);
if (cmdwin_type != 0) { if (text_or_buf_locked()) {
emsg(_(e_cmdwin));
return; return;
} }
FOR_ALL_TAB_WINDOWS(tp, wp) { FOR_ALL_TAB_WINDOWS(tp, wp) {
@@ -697,7 +697,7 @@ void f_win_splitmove(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
} }
// Check if we can split the target before we bother switching windows. // Check if we can split the target before we bother switching windows.
if (is_aucmd_win(wp) || check_split_disallowed(targetwin) == FAIL) { if (is_aucmd_win(wp) || text_or_buf_locked() || check_split_disallowed(targetwin) == FAIL) {
return; return;
} }

28
test/old/testdir/test_window_cmd.vim
View File

@@ -2177,4 +2177,32 @@ func Test_splitmove_autocmd_window_no_room()
%bw! %bw!
endfunc 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 " vim: shiftwidth=2 sts=2 expandtab