Keep the flag of BufWriteCmd on :wq command

Vim 8.2.2900 changed the event order on :wq command.
lambdalisue · Jun 12, 2021 · 6eba566 · 6eba566
1 parent 7069668
commit 6eba566
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/autoload/gina/command/commit.vim b/autoload/gina/command/commit.vim
@@ -315,13 +315,17 @@ function! s:QuitPre() abort
       call win_gotoid(win_id)
     endif
   endif
-  silent! unlet b:gina_BufWriteCmd
+  " Clear the flag set by :w but keep it when user hit :wq
+  if histget('cmd', -1) !~# '^\(wq\|x\%[it]\|exi\%[t]\)'
+    silent! unlet b:gina_BufWriteCmd
+  endif
 endfunction
 
 " NOTE:
 " :w      -- BufWriteCmd
 " <C-w>p  -- WinLeave
-" :wq     -- QuitPre -> BufWriteCmd -> WinLeave
+" :wq     -- QuitPre -> BufWriteCmd -> WinLeave (-8.2.2899)
+"            BufWriteCmd -> QuitPre -> WinLeave (8.2.2900-)
 " :q      -- QuitPre -> WinLeave
 function! s:WinLeave() abort
   if exists('b:gina_QuitPre')

diff --git a/autoload/gina/command/tag/edit.vim b/autoload/gina/command/tag/edit.vim
@@ -102,13 +102,17 @@ function! s:QuitPre() abort
       call win_gotoid(win_id)
     endif
   endif
-  silent! unlet b:gina_BufWriteCmd
+  " Clear the flag set by :w but keep it when user hit :wq
+  if histget('cmd', -1) !~# '^\(wq\|x\%[it]\|exi\%[t]\)'
+    silent! unlet b:gina_BufWriteCmd
+  endif
 endfunction
 
 " NOTE:
 " :w      -- BufWriteCmd
 " <C-w>p  -- WinLeave
-" :wq     -- QuitPre -> BufWriteCmd -> WinLeave
+" :wq     -- QuitPre -> BufWriteCmd -> WinLeave (-8.2.2899)
+"            BufWriteCmd -> QuitPre -> WinLeave (8.2.2900-)
 " :q      -- QuitPre -> WinLeave
 function! s:WinLeave() abort
   if exists('b:gina_QuitPre')