diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2024-03-11 11:26:02 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2024-03-11 11:42:03 +0800 |
| commit | 3b3511c4d9f1855d4240da0d844ce7875176c607 (patch) | |
| tree | 8958b54539e3b4df3b8e6eebf6f11c7fbecc1662 /src | |
| parent | d71791a11a260ca81067d63d69b5970078fffb6d (diff) | |
| download | rneovim-3b3511c4d9f1855d4240da0d844ce7875176c607.tar.gz rneovim-3b3511c4d9f1855d4240da0d844ce7875176c607.tar.bz2 rneovim-3b3511c4d9f1855d4240da0d844ce7875176c607.zip | |
vim-patch:9.1.0156: Make 'wfb' failing to split still report E1513
Problem: may not be clear why failing to split causes an ":Xdo" command
to abort if 'wfb' is set.
Solution: do not return immediately if win_split fails, so E1513 is
still given. Expect both errors in the test. Also fix tests to
pass CI.
(Sean Dewar)
closes: vim/vim#14152
https://github.com/vim/vim/commit/769eb2d0c3614f9ea6fffa82329558f1a4af384f
Co-authored-by: Sean Dewar <6256228+seandewar@users.noreply.github.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/ex_cmds2.c | 7 | ||||
| -rw-r--r-- | src/nvim/quickfix.c | 5 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c index 732631b678..12687d0ea8 100644 --- a/src/nvim/ex_cmds2.c +++ b/src/nvim/ex_cmds2.c @@ -457,12 +457,11 @@ void ex_listdo(exarg_T *eap) } if (curwin->w_p_wfb) { // Split the window, which will be 'nowinfixbuf', and set curwin to that - if (win_split(0, 0) == FAIL) { - return; // error message already given - } + (void)win_split(0, 0); + if (curwin->w_p_wfb) { // Autocommands set 'winfixbuf' or sent us to another window - // with it set. Give up. + // with it set, or we failed to split the window. Give up. emsg(_(e_winfixbuf_cannot_go_to_buffer)); return; } diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c index 28691914bb..0a4427f3c1 100644 --- a/src/nvim/quickfix.c +++ b/src/nvim/quickfix.c @@ -2828,8 +2828,9 @@ static int qf_jump_edit_buffer(qf_info_T *qi, qfline_T *qf_ptr, int forceit, int } if (curwin->w_p_wfb) { // Autocommands set 'winfixbuf' or sent us to another window - // with it set. Give up, but don't return immediately, as - // they may have messed with the list. + // with it set, or we failed to split the window. Give up, + // but don't return immediately, as they may have messed + // with the list. emsg(_(e_winfixbuf_cannot_go_to_buffer)); retval = FAIL; } |