vim: use internal patience diff algorithm

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index c467448a581afb2adb4dd93086d6e57084c42f03..79944d1cf6554e4a7ecf80853be28a095c6e80fd 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -161,8 +161,9 @@ set listchars+=extends:❯,precedes:❮
 set listchars+=trail:·
 augroup trailing
     au!
 set listchars+=trail:·
 augroup trailing
     au!

-    au InsertEnter * :set listchars-=trail:·
-    au InsertLeave * :set listchars+=trail:·
+    au FileType qf setlocal listchars-=trail:·
+    au InsertEnter * set listchars-=trail:·
+    au InsertLeave * set listchars+=trail:·

 augroup END
 
 set scrolloff=5                 " number of screen lines to show around the cursor
 augroup END
 
 set scrolloff=5                 " number of screen lines to show around the cursor


@@ -264,6 +265,8 @@ set viewoptions+=folds          " save folds
 set diffopt+=filler         " show filler lines
 set diffopt+=vertical       " always vertical split
 set diffopt+=context:10     " 10 lines context between changes
 set diffopt+=filler         " show filler lines
 set diffopt+=vertical       " always vertical split
 set diffopt+=context:10     " 10 lines context between changes

+set diffopt+=internal
+set diffopt+=algorithm:patience

 
 " reading and writing files {{{2
 set modeline                    " read modelines
 
 " reading and writing files {{{2
 set modeline                    " read modelines