Set autocmds according to given bufnr

Author: mhinz

autoload/sy.vim

@@ -35,7 +35,7 @@ function! sy#start(...) abort
           \    'file': sy#util#escape(fnamemodify(path, ':t'))
           \ }}
     call setbufvar(bufnr, 'sy', new_sy)
-    call sy#set_autocmds()
+    call sy#set_buflocal_autocmds(bufnr)
     call sy#repo#detect(bufnr)
   elseif has('vim_starting')
     call sy#verbose("Don't run Sy more than once during startup.")
@@ -114,35 +114,31 @@ function! sy#verbose(msg, ...) abort
   endif
 endfunction
 
-" #set_autocmds {{{1
-function! sy#set_autocmds() abort
-  augroup signify
-    autocmd! * <buffer>
+" #set_buflocal_autocmds {{{1
+function! sy#set_buflocal_autocmds(bufnr) abort
+  if get(g:, 'signify_disable_by_default')
+    return
+  endif
 
-    autocmd BufEnter     <buffer> call sy#start()
-    autocmd WinEnter     <buffer> call sy#start()
-    autocmd BufWritePost <buffer> call sy#start()
+  augroup signify
+    execute printf('autocmd! * <buffer=%d>', a:bufnr)
 
-    autocmd CursorHold   <buffer> call sy#start()
-    autocmd CursorHoldI  <buffer> call sy#start()
+    execute printf('autocmd BufEnter     <buffer=%d> call sy#start()', a:bufnr)
+    execute printf('autocmd WinEnter     <buffer=%d> call sy#start()', a:bufnr)
+    execute printf('autocmd BufWritePost <buffer=%d> call sy#start()', a:bufnr)
 
-    autocmd FocusGained  <buffer> SignifyRefresh
+    execute printf('autocmd CursorHold   <buffer=%d> call sy#start()', a:bufnr)
+    execute printf('autocmd CursorHoldI  <buffer=%d> call sy#start()', a:bufnr)
 
-    autocmd QuickFixCmdPre  *vimgrep* let g:signify_locked = 1
-    autocmd QuickFixCmdPost *vimgrep* let g:signify_locked = 0
+    execute printf('autocmd FocusGained  <buffer=%d> SignifyRefresh', a:bufnr)
 
-    autocmd CmdwinEnter <buffer> let g:signify_cmdwin_active = 1
-    autocmd CmdwinLeave <buffer> let g:signify_cmdwin_active = 0
+    execute printf('autocmd CmdwinEnter <buffer=%d> let g:signify_cmdwin_active = 1', a:bufnr)
+    execute printf('autocmd CmdwinLeave <buffer=%d> let g:signify_cmdwin_active = 0', a:bufnr)
 
-    autocmd ShellCmdPost <buffer> call sy#start()
+    execute printf('autocmd ShellCmdPost <buffer=%d> call sy#start()', a:bufnr)
 
     if exists('##VimResume')
-      autocmd VimResume <buffer> call sy#start()
-    endif
-
-    if has('gui_running') && has('win32') && argc()
-      " Fix 'no signs at start' race.
-      autocmd GUIEnter <buffer> redraw
+      execute printf('autocmd VimResume <buffer=%d> call sy#start()', a:bufnr)
     endif
   augroup END
 

doc/signify.txt

@@ -442,12 +442,12 @@ See all of them with:
 <
 You can disable sign updating for certain events:
 >
-    autocmd User SignifyAutocmd autocmd! signify CursorHold,CursorHoldI
+    autocmd User SignifyAutocmds autocmd! signify CursorHold,CursorHoldI
 <
 If you don't need immediate feedback or responses from your VCS are slow, then
 use this to only update signs when writing the buffer:
 >
-    autocmd User SignifyAutocmd
+    autocmd User SignifyAutocmds
           \ exe 'au! signify' | au signify BufWritePost * call sy#start()
 <
 ==============================================================================

plugin/signify.vim

@@ -58,12 +58,19 @@ xnoremap <silent> <plug>(signify-motion-outer-visual)  :<c-u>call sy#util#hunk_t
 
 let &cpoptions = s:cpoptions
 unlet s:cpoptions
-" 1}}}
 
-if !get(g:, 'signify_disable_by_default')
-  call sy#set_autocmds()
+" Autocmds {{{1
+if has('gui_running') && has('win32') && argc()
+  " Fix 'no signs at start' race.
+  autocmd GUIEnter * redraw
 endif
 
+autocmd QuickFixCmdPre  *vimgrep* let g:signify_locked = 1
+autocmd QuickFixCmdPost *vimgrep* let g:signify_locked = 0
+
+autocmd BufNewFile,BufRead * call sy#set_buflocal_autocmds(expand('<abuf>'))
+" 1}}}
+
 if exists('#User#SignifySetup')
   doautocmd <nomodeline> User SignifySetup
 endif