From 8157efff49151d583e6a706280b3f276ed82653f Mon Sep 17 00:00:00 2001
From: Tim Pope <code@tpope.net>
Date: Fri, 25 Mar 2022 18:07:25 -0400
Subject: [PATCH] Provide g:fugitive_defer_to_existing_maps

References: https://github.com/tpope/vim-fugitive/issues/1425
---
 autoload/fugitive.vim | 4 ++--
 plugin/fugitive.vim   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim
index d420ed3..9d0a3ea 100644
--- a/autoload/fugitive.vim
+++ b/autoload/fugitive.vim
@@ -208,7 +208,7 @@ let s:nowait = v:version >= 704 ? '<nowait>' : ''
 
 function! s:Map(mode, lhs, rhs, ...) abort
   let maps = []
-  let unique = a:0 && a:1 =~# '<unique>'
+  let defer = a:0 && a:1 =~# '<unique>' || get(g:, 'fugitive_defer_to_existing_maps')
   let flags = substitute(a:0 ? a:1 : '', '<unique>', '', '') . (a:rhs =~# '<Plug>' ? '' : '<script>') . s:nowait
   for mode in split(a:mode, '\zs')
     if a:0 <= 1
@@ -230,7 +230,7 @@ function! s:Map(mode, lhs, rhs, ...) abort
       let tail = matchstr(head, '<[^<>]*>$\|.$') . tail
       let head = substitute(head, '<[^<>]*>$\|.$', '', '')
     endwhile
-    if !skip && (!unique || empty(mapcheck(head.tail, mode)))
+    if !skip && (!defer || empty(mapcheck(head.tail, mode)))
       call add(maps, mode.'map <buffer>' . flags . ' ' . head.tail . ' ' . a:rhs)
       if a:0 > 1 && a:2
         let b:undo_ftplugin = get(b:, 'undo_ftplugin', 'exe') .
diff --git a/plugin/fugitive.vim b/plugin/fugitive.vim
index 96215e0..6801f6f 100644
--- a/plugin/fugitive.vim
+++ b/plugin/fugitive.vim
@@ -725,7 +725,7 @@ function! s:Map(mode, lhs, rhs, flags) abort
       let head = substitute(head, '<[^<>]*>$\|.$', '', '')
     endwhile
   endif
-  if flags !~# '<unique>' || empty(mapcheck(head.tail, a:mode))
+  if empty(mapcheck(head.tail, a:mode))
     exe a:mode.'map' s:nowait flags head.tail a:rhs
   endif
 endfunction