Set delta width

Fix #1219
This commit is contained in:
Junegunn Choi
2021-05-24 16:29:31 +09:00
parent a88311b222
commit d7211d0f61

View File

@@ -643,7 +643,7 @@ function! fzf#vim#gitfiles(args, ...)
let preview = printf( let preview = printf(
\ 'bash -c "if [[ {1} =~ M ]]; then %s; else %s {-1}; fi"', \ 'bash -c "if [[ {1} =~ M ]]; then %s; else %s {-1}; fi"',
\ executable('delta') \ executable('delta')
\ ? 'git diff -- {-1} | delta --file-style=omit | sed 1d' \ ? 'git diff -- {-1} | delta --width $FZF_PREVIEW_COLUMNS --file-style=omit | sed 1d'
\ : 'git diff --color=always -- {-1} | sed 1,4d', \ : 'git diff --color=always -- {-1} | sed 1,4d',
\ s:bin.preview) \ s:bin.preview)
let wrapped = fzf#wrap({ let wrapped = fzf#wrap({
@@ -1241,7 +1241,7 @@ function! s:commits(buffer_local, args)
endif endif
if !s:is_win && &columns > s:wide if !s:is_win && &columns > s:wide
let suffix = executable('delta') ? '| delta' : '--color=always' let suffix = executable('delta') ? '| delta --width $FZF_PREVIEW_COLUMNS' : '--color=always'
call extend(options.options, 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: ' . suffix])
endif endif