From 2375f88e5657a195b032ea1684f9cc8b9afa5b9d Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Wed, 19 Apr 2023 08:34:39 +0000 Subject: [PATCH 1/2] home: vim: use patience diff This brings it in line with my `git` configuration. --- home/vim/init.vim | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/vim/init.vim b/home/vim/init.vim index 259c782..2ebc6d6 100644 --- a/home/vim/init.vim +++ b/home/vim/init.vim @@ -66,6 +66,9 @@ set list " Show a tab as an arrow, trailing spaces as ¤, non-breaking spaces as dots set listchars=tab:>─,trail:·,nbsp:¤ +" Use patience diff +set diffopt+=algorithm:patience + " Don't redraw when executing macros set lazyredraw From e9f07e67dca8806ad99554cf3936d2d7e4139c6e Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Wed, 19 Apr 2023 08:36:40 +0000 Subject: [PATCH 2/2] home: vim: add diff line matching This should bring more readable diffs. See [1]. [1]: https://github.com/neovim/neovim/pull/14537 --- home/vim/init.vim | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/vim/init.vim b/home/vim/init.vim index 2ebc6d6..4d8b85d 100644 --- a/home/vim/init.vim +++ b/home/vim/init.vim @@ -68,6 +68,8 @@ set listchars=tab:>─,trail:·,nbsp:¤ " Use patience diff set diffopt+=algorithm:patience +" Align similar lines in each hunk +set diffopt+=linematch:50 " Don't redraw when executing macros set lazyredraw