adam/prezto
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improved handling of color diff.

Browse Source
This commit is contained in:
Sorin Ionescu 2011-12-28 10:34:23 -05:00
parent 2679db1ffb
commit fb26ff880c
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
alias.zsh
View File

@ -80,17 +80,27 @@ fi
# Diff/Make # Diff/Make
if zstyle -t ':omz:alias:diff' color; then if zstyle -t ':omz:alias:diff' color; then
if (( $+commands[colordiff] )); then
alias diff='colordiff -u'
compdef colordiff=diff
elif (( $+commands[git] )); then
function diff() { function diff() {
git --no-pager diff --color=always --no-ext-diff --no-index "$@"; if (( $+commands[colordiff] )); then
} "$commands[diff]" --unified "$@" | colordiff --difftype diffu
compdef _git diff=git-diff elif (( $+commands[git] )); then
git --no-pager diff --color=auto --no-ext-diff --no-index "$@"
else else
alias diff='diff -u' "$commands[diff]" --unified "$@"
fi fi
}
function wdiff() {
if (( $+commands[wdiff] )) && (( $+commands[colordiff] )); then
"$commands[diff]" --unified "$@" | "$commands[wdiff]" --diff-input --avoid-wraps | colordiff --difftype wdiff
elif (( $+commands[git] )); then
git --no-pager diff --color=auto --no-ext-diff --no-index --word-diff "$@"
elif (( $+commands[wdiff] )); then
"$commands[diff]" --unified "$@" | "$commands[wdiff]" --diff-input --avoid-wraps
else
print "zsh: command not found: $0" >&2
fi
}
if (( $+commands[colormake] )); then if (( $+commands[colormake] )); then
alias make='colormake' alias make='colormake'