From 90b7d98b6c74a4d820d9a13d60aef1228ef25d24 Mon Sep 17 00:00:00 2001
From: Tim Pope <code@tpope.net>
Date: Sat, 25 Jan 2020 11:23:14 -0500
Subject: [PATCH] Temporarily restore User Fugitive autocommand

References https://github.com/tpope/vim-fugitive/issues/1441
---
 autoload/fugitive.vim |  2 +-
 plugin/fugitive.vim   | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim
index 787849f..edeefd2 100644
--- a/autoload/fugitive.vim
+++ b/autoload/fugitive.vim
@@ -2052,7 +2052,7 @@ function! fugitive#BufReadStatus() abort
     endfor
 
     let b:fugitive_reltime = reltime()
-    return 'silent ' . s:DoAutocmd('User Fugitive') . '|silent ' . s:DoAutocmd('User FugitiveIndex')
+    return 'silent ' . s:DoAutocmd('User FugitiveIndex')
   catch /^fugitive:/
     return 'echoerr ' . string(v:exception)
   endtry
diff --git a/plugin/fugitive.vim b/plugin/fugitive.vim
index e0c5c74..a1e66fb 100644
--- a/plugin/fugitive.vim
+++ b/plugin/fugitive.vim
@@ -279,6 +279,23 @@ function! FugitiveDetect(path) abort
       let b:git_dir = dir
     endif
   endif
+  if !exists('b:git_dir') || !exists('#User#Fugitive')
+    return ''
+  endif
+  if v:version >= 704 || (v:version == 703 && has('patch442'))
+    doautocmd <nomodeline> User Fugitive
+  elseif &modelines > 0
+    let modelines = &modelines
+    try
+      set modelines=0
+      doautocmd User Fugitive
+    finally
+      let &modelines = modelines
+    endtry
+  else
+    doautocmd User Fugitive
+  endif
+  return ''
 endfunction
 
 function! FugitiveVimPath(path) abort