VimPlug/fzf.vim
1
0
Fork 0
mirror of https://github.com/junegunn/fzf.vim.git synced 2026-01-30 14:45:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[[B]Commits] Use --color=always with delta as well (#1362)

Browse Source 
With some delta configurations (e.g. color-only = true, diff-highlight =
true), delta doesn't add its own coloring and keeps that from git diff,
and thus we need to turn that on.

Additionally, delta doesn't do its own detection of moved lines and
relies on git diff's colorMoved, which also needs enabling of colors.
This commit is contained in:
Tomáš Janoušek
2022-02-01 06:34:48 +00:00
committed by GitHub
parent 70541d2ee0
commit 1f7bfa4007
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
autoload/fzf/vim.vim
View File

@@ -1229,9 +1229,9 @@ function! s:commits(range, buffer_local, args)
endif
if !s:is_win && &columns > s:wide
let suffix = executable('delta') ? '| delta --width $FZF_PREVIEW_COLUMNS' : '--color=always'
let suffix = executable('delta') ? '| delta --width $FZF_PREVIEW_COLUMNS' : ''
call extend(options.options,
\ ['--preview', 'echo {} | grep -o "[a-f0-9]\{7,\}" | head -1 | xargs git show --format=format: ' . suffix])
\ ['--preview', 'echo {} | grep -o "[a-f0-9]\{7,\}" | head -1 | xargs git show --format=format: --color=always ' . suffix])
endif
return s:fzf(a:buffer_local ? 'bcommits' : 'commits', options, a:args)