From c4301f9a103ac1429d05131e7debdac5eb6c4c23 Mon Sep 17 00:00:00 2001
From: Andy Stewart <boss@airbladesoftware.com>
Date: Tue, 29 May 2018 10:27:52 +0100
Subject: [PATCH] Extract autocommand commands to a function for clarity.

---
 plugin/gitgutter.vim | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/plugin/gitgutter.vim b/plugin/gitgutter.vim
index 638172a..8e71c9c 100644
--- a/plugin/gitgutter.vim
+++ b/plugin/gitgutter.vim
@@ -175,14 +175,30 @@ nnoremap <silent> <Plug>GitGutterPreviewHunk :GitGutterPreviewHunk<CR>
 
 function! s:flag_inactive_tabs()
   let active_tab = tabpagenr()
-  let last_tab = tabpagenr('$')
-  for i in range(1, last_tab)
+  for i in range(1, tabpagenr('$'))
     if i != active_tab
       call settabvar(i, 'gitgutter_force', 1)
     endif
   endfor
 endfunction
 
+function! s:on_bufenter()
+  if exists('t:gitgutter_didtabenter') && t:gitgutter_didtabenter
+    let t:gitgutter_didtabenter = 0
+    let force = !g:gitgutter_terminal_reports_focus
+
+    if exists('t:gitgutter_force') && t:gitgutter_force
+      let t:gitgutter_force = 0
+      let force = 1
+    endif
+
+    call gitgutter#all(force)
+  else
+    call gitgutter#init_buffer(bufnr(''))
+    call gitgutter#process_buffer(bufnr(''), !g:gitgutter_terminal_reports_focus)
+  endif
+endfunction
+
 " Autocommands {{{
 
 augroup gitgutter
@@ -190,19 +206,7 @@ augroup gitgutter
 
   autocmd TabEnter * let t:gitgutter_didtabenter = 1
 
-  autocmd BufEnter *
-        \ if exists('t:gitgutter_didtabenter') && t:gitgutter_didtabenter |
-        \   let t:gitgutter_didtabenter = 0 |
-        \   let force = !g:gitgutter_terminal_reports_focus |
-        \   if exists('t:gitgutter_force') && t:gitgutter_force |
-        \     let t:gitgutter_force = 0 |
-        \     let force = 1 |
-        \   endif |
-        \   call gitgutter#all(force) |
-        \ else |
-        \   call gitgutter#init_buffer(bufnr('')) |
-        \   call gitgutter#process_buffer(bufnr(''), !g:gitgutter_terminal_reports_focus) |
-        \ endif
+  autocmd BufEnter * call s:on_bufenter()
 
   autocmd CursorHold,CursorHoldI            * call gitgutter#process_buffer(bufnr(''), 0)
   autocmd FileChangedShellPost,ShellCmdPost * call gitgutter#process_buffer(bufnr(''), 1)