From 250112fecfc6201bfae7739c18c2ff61a4caf2dc Mon Sep 17 00:00:00 2001 From: Andy Stewart Date: Thu, 1 Jun 2023 09:21:52 +0100 Subject: [PATCH] Check before enabling after disabling for autocmds Fixes #860. See #551, #801. --- plugin/gitgutter.vim | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugin/gitgutter.vim b/plugin/gitgutter.vim index 008724e..5ddf0ed 100644 --- a/plugin/gitgutter.vim +++ b/plugin/gitgutter.vim @@ -296,8 +296,8 @@ augroup gitgutter autocmd User FugitiveChanged call gitgutter#all(1) - autocmd BufFilePre * GitGutterBufferDisable - autocmd BufFilePost * GitGutterBufferEnable + autocmd BufFilePre * let b:gitgutter_was_enabled = gitgutter#utility#getbufvar(expand(''), 'enabled') | GitGutterBufferDisable + autocmd BufFilePost * if b:gitgutter_was_enabled | GitGutterBufferEnable | endif | unlet b:gitgutter_was_enabled " Handle all buffers when focus is gained, but only after it was lost. " FocusGained gets triggered on startup with Neovim at least already. @@ -313,8 +313,8 @@ augroup gitgutter autocmd ColorScheme * call gitgutter#highlight#define_highlights() " Disable during :vimgrep - autocmd QuickFixCmdPre *vimgrep* let [g:gitgutter_was_enabled, g:gitgutter_enabled] = [g:gitgutter_enabled, 0] - autocmd QuickFixCmdPost *vimgrep* let g:gitgutter_enabled = g:gitgutter_was_enabled | unlet g:gitgutter_was_enabled + autocmd QuickFixCmdPre *vimgrep* let b:gitgutter_was_enabled = gitgutter#utility#getbufvar(expand(''), 'enabled') | GitGutterBufferDisable + autocmd QuickFixCmdPost *vimgrep* if b:gitgutter_was_enabled | GitGutterBufferEnable | endif | unlet b:gitgutter_was_enabled augroup END " }}}