From c75c83df531881008f8cf903eab7cd68bc19ff7a Mon Sep 17 00:00:00 2001
From: Andy Stewart <boss@airbladesoftware.com>
Date: Fri, 26 Jul 2019 10:27:58 +0100
Subject: [PATCH] Ensure maps set on all buffers for vim -o/-O.

Fixes #634.
---
 autoload/gitgutter.vim | 12 +++++++-----
 plugin/gitgutter.vim   |  2 ++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/autoload/gitgutter.vim b/autoload/gitgutter.vim
index cc6f7cf..0f89007 100644
--- a/autoload/gitgutter.vim
+++ b/autoload/gitgutter.vim
@@ -25,8 +25,6 @@ function! gitgutter#process_buffer(bufnr, force) abort
 
   if gitgutter#utility#is_active(a:bufnr)
 
-    call s:setup_maps(a:bufnr)
-
     if has('patch-7.4.1559')
       let l:Callback = function('gitgutter#process_buffer', [a:bufnr, a:force])
     else
@@ -108,12 +106,16 @@ endfunction
 
 " }}}
 
-function! s:setup_maps(bufnr)
+function! gitgutter#setup_maps()
   if !g:gitgutter_map_keys
     return
   endif
 
-  if gitgutter#utility#getbufvar(a:bufnr, 'mapped', 0)
+  " Note hasmapto() and maparg() operate on the current buffer.
+
+  let bufnr = bufnr('')
+
+  if gitgutter#utility#getbufvar(bufnr, 'mapped', 0)
     return
   endif
 
@@ -147,7 +149,7 @@ function! s:setup_maps(bufnr)
     xmap <buffer> ac <Plug>GitGutterTextObjectOuterVisual
   endif
 
-  call gitgutter#utility#setbufvar(a:bufnr, 'mapped', 1)
+  call gitgutter#utility#setbufvar(bufnr, 'mapped', 1)
 endfunction
 
 function! s:setup_path(bufnr, continuation)
diff --git a/plugin/gitgutter.vim b/plugin/gitgutter.vim
index 4d82c84..c9197d9 100644
--- a/plugin/gitgutter.vim
+++ b/plugin/gitgutter.vim
@@ -186,6 +186,8 @@ nnoremap <silent> <Plug>GitGutterPreviewHunk :GitGutterPreviewHunk<CR>
 " }}}
 
 function! s:on_bufenter()
+  call gitgutter#setup_maps()
+
   if exists('t:gitgutter_didtabenter') && t:gitgutter_didtabenter
     let t:gitgutter_didtabenter = 0
     call gitgutter#all(!g:gitgutter_terminal_reports_focus)