Include foldcolumn in diff width calculation

This commit is contained in:
Tim Pope
2014-06-21 08:25:02 -04:00
parent c5a3c5f8ce
commit aed0043a1f

View File

@@ -1412,7 +1412,8 @@ function! s:diff_horizontal() abort
elseif &diffopt =~# 'vertical'
return 0
else
return winwidth(0) <= 2 * (&tw ? &tw : 80)
let fdc = matchstr(&diffopt, 'foldcolumn:\zs\d\+')
return winwidth(0) <= 2 * ((&tw ? &tw : 80) + (empty(fdc) ? 2 : fdc))
endif
endfunction