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>
diff --git a/src/tag.c b/src/tag.c
index 2ac0da2..9117d0f 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -289,17 +289,6 @@
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 @@
}
#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;
diff --git a/src/testdir/test_winfixbuf.vim b/src/testdir/test_winfixbuf.vim
index 610e8e0..edf71f0 100644
--- 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 @@
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
diff --git a/src/version.c b/src/version.c
index 46dd273..3067d75 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 216,
+/**/
215,
/**/
214,