diff options
| author | Jan Edmund Lazo <janedmundlazo@hotmail.com> | 2018-06-25 19:42:55 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <janedmundlazo@hotmail.com> | 2018-06-26 10:21:39 -0400 |
| commit | 33eb5833b2baefce3797f4544bc1567d0c23c9e7 (patch) | |
| tree | a3a2d93276ec480f10d14d1a7cd1057c4cbda93b | |
| parent | bfe029a11deaa923980400bcfc3e043136474759 (diff) | |
| download | rneovim-33eb5833b2baefce3797f4544bc1567d0c23c9e7.tar.gz rneovim-33eb5833b2baefce3797f4544bc1567d0c23c9e7.tar.bz2 rneovim-33eb5833b2baefce3797f4544bc1567d0c23c9e7.zip | |
vim-patch:8.0.0688: cannot resize the window in a FileType autocommand
Problem: Cannot resize the window in a FileType autocommand. (Ingo Karkat)
Solution: Add the CMDWIN flag to :resize. (test by Ingo Karkat,
closes vim/vim#1804)
https://github.com/vim/vim/commit/9c4fefffb65a2ed9b4a5b0f1bde0da8f349470b5
| -rw-r--r-- | src/nvim/ex_cmds.lua | 2 | ||||
| -rw-r--r-- | src/nvim/ex_cmds_defs.h | 4 | ||||
| -rw-r--r-- | src/nvim/testdir/test_quickfix.vim | 41 |
3 files changed, 33 insertions, 14 deletions
diff --git a/src/nvim/ex_cmds.lua b/src/nvim/ex_cmds.lua index 31776a70e7..df1aa938ed 100644 --- a/src/nvim/ex_cmds.lua +++ b/src/nvim/ex_cmds.lua @@ -2158,7 +2158,7 @@ return { }, { command='resize', - flags=bit.bor(RANGE, NOTADR, TRLBAR, WORD1), + flags=bit.bor(RANGE, NOTADR, TRLBAR, WORD1, CMDWIN), addr_type=ADDR_LINES, func='ex_resize', }, diff --git a/src/nvim/ex_cmds_defs.h b/src/nvim/ex_cmds_defs.h index d72b83404e..6c36922c09 100644 --- a/src/nvim/ex_cmds_defs.h +++ b/src/nvim/ex_cmds_defs.h @@ -59,7 +59,9 @@ #define BUFUNL 0x20000 /* accepts unlisted buffer too */ #define ARGOPT 0x40000 /* allow "++opt=val" argument */ #define SBOXOK 0x80000 /* allowed in the sandbox */ -#define CMDWIN 0x100000 /* allowed in cmdline window */ +#define CMDWIN 0x100000 /* allowed in cmdline window; when missing + * disallows editing another buffer when + * curbuf_lock is set */ #define MODIFY 0x200000 /* forbidden in non-'modifiable' buffer */ #define EXFLAGS 0x400000 /* allow flags after count in argument */ #define FILES (XFILE | EXTRA) /* multiple extra files allowed */ diff --git a/src/nvim/testdir/test_quickfix.vim b/src/nvim/testdir/test_quickfix.vim index 646245f857..8d2c61f6f0 100644 --- a/src/nvim/testdir/test_quickfix.vim +++ b/src/nvim/testdir/test_quickfix.vim @@ -2169,18 +2169,6 @@ func Test_bufoverflow() set efm&vim endfunc -func Test_cclose_from_copen() - augroup QF_Test - au! - au FileType qf :call assert_fails(':cclose', 'E788') - augroup END - copen - augroup QF_Test - au! - augroup END - augroup! QF_Test -endfunc - " Tests for getting the quickfix stack size func XsizeTests(cchar) call s:setup_commands(a:cchar) @@ -2210,6 +2198,18 @@ func Test_Qf_Size() call XsizeTests('l') endfunc +func Test_cclose_from_copen() + augroup QF_Test + au! + au FileType qf :call assert_fails(':cclose', 'E788') + augroup END + copen + augroup QF_Test + au! + augroup END + augroup! QF_Test +endfunc + func Test_cclose_in_autocmd() " Problem is only triggered if "starting" is zero, so that the OptionsSet " event will be triggered. @@ -2225,3 +2225,20 @@ func Test_cclose_in_autocmd() augroup! QF_Test " call test_override('starting', 0) endfunc + +func Test_resize_from_copen() + augroup QF_Test + au! + au FileType qf resize 5 + augroup END + try + " This should succeed without any exception. No other buffers are + " involved in the autocmd. + copen + finally + augroup QF_Test + au! + augroup END + augroup! QF_Test + endtry +endfunc |