Mercurial > vim
changeset 34667:968626cf50fa v9.1.0216
patch 9.1.0216: Error on exit with EXITFREE and 'winfixbuf'
Commit: https://github.com/vim/vim/commit/620e85265ce04654053c64f8058914ecafe4eb38
Author: zeertzjq <zeertzjq@outlook.com>
Date: Thu Mar 28 10:11:57 2024 +0100
patch 9.1.0216: Error on exit with EXITFREE and 'winfixbuf'
Problem: Error on exit with EXITFREE and 'winfixbuf'.
Solution: Handle DT_FREE before checking for 'winfixbuf'.
(zeertzjq)
closes: #14314
Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 28 Mar 2024 10:15:10 +0100 |
| parents | 35657bd4cc05 |
| children | 79db613c6126 |
| files | src/tag.c src/testdir/test_winfixbuf.vim src/version.c |
| diffstat | 3 files changed, 25 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/tag.c +++ b/src/tag.c @@ -289,17 +289,6 @@ do_tag( static char_u **matches = NULL; static int flags; - if (postponed_split == 0 && !check_can_set_curbuf_forceit(forceit)) - return FALSE; - -#ifdef FEAT_EVAL - if (tfu_in_use) - { - emsg(_(e_cannot_modify_tag_stack_within_tagfunc)); - return FALSE; - } -#endif - #ifdef EXITFREE if (type == DT_FREE) { @@ -313,6 +302,17 @@ do_tag( } #endif +#ifdef FEAT_EVAL + if (tfu_in_use) + { + emsg(_(e_cannot_modify_tag_stack_within_tagfunc)); + return FALSE; + } +#endif + + if (postponed_split == 0 && !check_can_set_curbuf_forceit(forceit)) + return FALSE; + if (type == DT_HELP) { type = DT_TAG;
--- a/src/testdir/test_winfixbuf.vim +++ b/src/testdir/test_winfixbuf.vim @@ -1,6 +1,7 @@ " Test 'winfixbuf' source check.vim +source shared.vim " Find the number of open windows in the current tab func s:get_windows_count() @@ -3427,4 +3428,15 @@ func Test_bufdo_cnext_splitwin_fails() set winminheight&vim winheight&vim endfunc +" Test that exiting with 'winfixbuf' and EXITFREE doesn't cause an error. +func Test_exitfree_no_error() + let lines =<< trim END + set winfixbuf + qall! + END + call writefile(lines, 'Xwfb_exitfree', 'D') + call assert_notmatch('E1513:', + \ system(GetVimCommandClean() .. ' -X -S Xwfb_exitfree')) +endfunc + " vim: shiftwidth=2 sts=2 expandtab