Skip to content

Commit

Permalink
fix(diffopt): Apple removed xdiff lib.
Browse files Browse the repository at this point in the history
See this comment, for explanation:
agude/dotfiles#2 (comment)

Other places mentioned:
thoughtbot/dotfiles#655
  • Loading branch information
craigmac committed Apr 22, 2022
1 parent 8495d00 commit 29f6832
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,13 @@ set belloff=all
set clipboard=unnamed,unnamedplus
set complete-=i
set completeopt=menuone,popup
" BUG: see https://github.com/vim/vim/issues/10250
" if has('patch-8.1.0360') | set diffopt+=algorithm:patience | endif
" macOS /usr/bin/vim removed 'xdiff' lib bc of GPL
if has('mac') && has('patch-8.1.0360') && $VIM == '/usr/share/vim'
set diffopt-=internal
elseif has('patch-8.1.0360')
set diffopt+=algorithm:patience
endif
set diffopt+=vertical
set display=truncate
set errorformat+=%f | " :cexpr system('cat /tmp/list-o-filenames.txt')
set exrc secure
Expand Down

0 comments on commit 29f6832

Please sign in to comment.