motiejus/dotfiles

commit 6d497b0e63173f89cfabe12ea27a7a5a8b29ac8a (tree)
parent dcf32d2b3d0bb1abe2e46041adb48b13ba328332
Author: Tim Pope <code@tpope.net>
Date:   Sun, 28 Oct 2018 19:48:15 -0400

Fix erroneous use of :keeppatterns g/.../s//.../

Closes https://github.com/tpope/vim-fugitive/issues/1008

Diffstat:
M
autoload/fugitive.vim
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim
@@ -1516,7 +1516,7 @@ function! fugitive#BufReadCmd(...) abort
           if lnum
             silent keepjumps delete_
           end
-          silent exe (exists(':keeppatterns') ? 'keeppatterns' : '') 'keepjumps 1,/^diff --git\|\%$/g/\r$/s///'
+          silent exe (exists(':keeppatterns') ? 'keeppatterns' : '') 'keepjumps 1,/^diff --git\|\%$/s/\r$//e'
           keepjumps 1
         endif
       elseif b:fugitive_type ==# 'stage'