vim: use internal patience diff algorithm

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 67b77a619f467ff98c216fa54cfece6d2843883d..79944d1cf6554e4a7ecf80853be28a095c6e80fd 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -112,6 +112,7 @@ Plug 'aklt/plantuml-syntax'
 
 Plug 'mtth/scratch.vim'  " {{{2
   let g:scratch_no_mappings = 1
 
 Plug 'mtth/scratch.vim'  " {{{2
   let g:scratch_no_mappings = 1

+  let g:scratch_autohide = 0

 "}}}
 
 Plug 'vim-utils/vim-man'  " {{{2
 "}}}
 
 Plug 'vim-utils/vim-man'  " {{{2


@@ -129,6 +130,8 @@ let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
 let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
 set termguicolors
 colorscheme $THEME
 let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
 set termguicolors
 colorscheme $THEME

+"TODO see how I can integrate this into a theme that customises upstream Nord
+hi debugPC term=reverse ctermbg=8

 
 " options {{{1
 " moving around, searching and patterns {{{2
 
 " options {{{1
 " moving around, searching and patterns {{{2


@@ -158,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


@@ -261,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