From 66933b45dcff8cc9f323a71583bca3698566abb9 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 19 Oct 2022 07:10:22 +0800
Subject: vim-patch:9.0.0789: dummy buffer ends up in a window

Problem:    Dummy buffer ends up in a window.
Solution:   Disallow navigating to a dummy buffer.
https://github.com/vim/vim/commit/8f3c3c6cd044e3b5bf08dbfa3b3f04bb3f711bad
---
 src/nvim/buffer.c                 |  5 +++++
 src/nvim/testdir/test_autocmd.vim | 20 ++++++++++++++++++++
 2 files changed, 25 insertions(+)

(limited to 'src')

diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 84ff2fa59b..8016904702 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -1224,6 +1224,11 @@ int do_buffer(int action, int start, int dir, int count, int forceit)
     }
     return FAIL;
   }
+  if ((action == DOBUF_GOTO || action == DOBUF_SPLIT) && (buf->b_flags & BF_DUMMY)) {
+    // disallow navigating to the dummy buffer
+    semsg(_(e_nobufnr), count);
+    return FAIL;
+  }
 
   // delete buffer "buf" from memory and/or the list
   if (unload) {
diff --git a/src/nvim/testdir/test_autocmd.vim b/src/nvim/testdir/test_autocmd.vim
index f98d7d10ab..e869353893 100644
--- a/src/nvim/testdir/test_autocmd.vim
+++ b/src/nvim/testdir/test_autocmd.vim
@@ -3269,4 +3269,24 @@ func Test_noname_autocmd()
   augroup! test_noname_autocmd_group
 endfunc
 
+func Test_autocmd_split_dummy()
+  " Autocommand trying to split a window containing a dummy buffer.
+  auto BufReadPre * exe "sbuf " .. expand("<abuf>") 
+  " Avoid the "W11" prompt
+  au FileChangedShell * let v:fcs_choice = 'reload'
+  func Xautocmd_changelist()
+    cal writefile(['Xtestfile2:4:4'], 'Xerr')
+    edit Xerr
+    lex 'Xtestfile2:4:4'
+  endfunc
+  call Xautocmd_changelist()
+  call assert_fails('call Xautocmd_changelist()', 'E86:')
+
+  au! BufReadPre
+  au! FileChangedShell
+  delfunc Xautocmd_changelist
+  bwipe! Xerr
+  call delete('Xerr')
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
-- 
cgit 


From 88eeb4d941a4ae3f75bbf4faae2882786e44f687 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 19 Oct 2022 07:15:08 +0800
Subject: vim-patch:9.0.0790: test for dummy buffer does not always produce the
 E86 error

Problem:    Test for dummy buffer does not always produce the E86 error.
Solution:   Do not check if the error is produced.
https://github.com/vim/vim/commit/53c5c9f50ca68d3ed559eebb2c5f7d23f39a768c
---
 src/nvim/testdir/test_autocmd.vim | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/nvim/testdir/test_autocmd.vim b/src/nvim/testdir/test_autocmd.vim
index e869353893..8c15249f97 100644
--- a/src/nvim/testdir/test_autocmd.vim
+++ b/src/nvim/testdir/test_autocmd.vim
@@ -3280,7 +3280,8 @@ func Test_autocmd_split_dummy()
     lex 'Xtestfile2:4:4'
   endfunc
   call Xautocmd_changelist()
-  call assert_fails('call Xautocmd_changelist()', 'E86:')
+  " Should get E86, but it doesn't always happen (timing?)
+  silent! call Xautocmd_changelist()
 
   au! BufReadPre
   au! FileChangedShell
-- 
cgit