@ -3,10 +3,12 @@
#
#
# Authors:
# Authors:
# Sorin Ionescu <sorin.ionescu@gmail.com>
# Sorin Ionescu <sorin.ionescu@gmail.com>
# Indrajit Raychaudhuri <irc@indrajit.com>
#
#
function wdiff {
# function wdiff {
if zstyle -t ':prezto:module:utility:wdiff' color; then
if zstyle -t ':prezto:module:utility:wdiff' color; then
if (( $+commands[wdiff] )); then
if (( $+commands[wdiff] )); then
command wdiff \
command wdiff \
--avoid-wraps \
--avoid-wraps \
@ -17,13 +19,14 @@ function wdiff {
"$@" \
"$@" \
| sed 's/^\(@@\( [+-][[:digit:]]*,[[:digit:]]*\)\{2\} @@\)$/;5;6m\10m/g'
| sed 's/^\(@@\( [+-][[:digit:]]*,[[:digit:]]*\)\{2\} @@\)$/;5;6m\10m/g'
elif (( $+commands[git] )); then
elif (( $+commands[git] )); then
command git --no-pager diff --color=auto -- no-ext-diff --no-index --color-words "$@"
command git --no-pager diff --no-ext-diff --no-index --color=auto --color-words "$@"
else
else
command wdiff "$@"
command wdiff "$@"
fi
fi
else
elif (( ! $+commands[wdiff] && $+commands[git] )); then
command git --no-pager diff --no-ext-diff --no-index --color=never "$@"
else
command wdiff "$@"
command wdiff "$@"
fi
fi
}
wdiff "$@"
# }