From 1928b79e0ce6aa2169d735e7d6af336c74152d7a Mon Sep 17 00:00:00 2001
From: lonerover <pathfinder1644@yahoo.com>
Date: Wed, 28 Dec 2016 06:39:21 +0800
Subject: vim-patch:7.4.1837 (#5834)

Problem:    The BufUnload event is triggered twice, when :bunload is used with
             set to  or .
Solution:   Do not trigger the event when ml_mfp is NULL. (Hirohito Higashi)

https://github.com/vim/vim/commit/c67e89213476b5f4756d92208b57ce9ef4a4cf24
---
 src/nvim/testdir/test_autocmd.vim | 69 +++++++++++++++++++++++++++------------
 1 file changed, 48 insertions(+), 21 deletions(-)

(limited to 'src/nvim/testdir')

diff --git a/src/nvim/testdir/test_autocmd.vim b/src/nvim/testdir/test_autocmd.vim
index d3e0981025..1dceb70cd4 100644
--- a/src/nvim/testdir/test_autocmd.vim
+++ b/src/nvim/testdir/test_autocmd.vim
@@ -7,29 +7,56 @@ func Test_vim_did_enter()
   " becomes one.
 endfunc
 
-if !has('timers')
-  finish
+if has('timers')
+  func ExitInsertMode(id)
+    call feedkeys("\<Esc>")
+  endfunc
+
+  func Test_cursorhold_insert()
+    let g:triggered = 0
+    au CursorHoldI * let g:triggered += 1
+    set updatetime=20
+    call timer_start(100, 'ExitInsertMode')
+    call feedkeys('a', 'x!')
+    call assert_equal(1, g:triggered)
+  endfunc
+
+  func Test_cursorhold_insert_ctrl_x()
+    let g:triggered = 0
+    au CursorHoldI * let g:triggered += 1
+    set updatetime=20
+    call timer_start(100, 'ExitInsertMode')
+    " CursorHoldI does not trigger after CTRL-X
+    call feedkeys("a\<C-X>", 'x!')
+    call assert_equal(0, g:triggered)
+  endfunc
 endif
 
-func ExitInsertMode(id)
-  call feedkeys("\<Esc>")
-endfunc
+function Test_bufunload()
+  augroup test_bufunload_group
+    autocmd!
+    autocmd BufUnload * call add(s:li, "bufunload")
+    autocmd BufDelete * call add(s:li, "bufdelete")
+    autocmd BufWipeout * call add(s:li, "bufwipeout")
+  augroup END
 
-func Test_cursorhold_insert()
-  let g:triggered = 0
-  au CursorHoldI * let g:triggered += 1
-  set updatetime=20
-  call timer_start(100, 'ExitInsertMode')
-  call feedkeys('a', 'x!')
-  call assert_equal(1, g:triggered)
-endfunc
+  let s:li=[]
+  new
+  setlocal bufhidden=
+  bunload
+  call assert_equal(["bufunload", "bufdelete"], s:li)
+
+  let s:li=[]
+  new
+  setlocal bufhidden=delete
+  bunload
+  call assert_equal(["bufunload", "bufdelete"], s:li)
+
+  let s:li=[]
+  new
+  setlocal bufhidden=unload
+  bwipeout
+  call assert_equal(["bufunload", "bufdelete", "bufwipeout"], s:li)
 
-func Test_cursorhold_insert_ctrl_x()
-  let g:triggered = 0
-  au CursorHoldI * let g:triggered += 1
-  set updatetime=20
-  call timer_start(100, 'ExitInsertMode')
-  " CursorHoldI does not trigger after CTRL-X
-  call feedkeys("a\<C-X>", 'x!')
-  call assert_equal(0, g:triggered)
+  augroup! test_bufunload_group
 endfunc
-- 
cgit