|
|
|
@ -5,10 +5,10 @@
|
|
|
|
|
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
if zstyle -t ':omz:module:utility:wdiff' color; then
|
|
|
|
|
function wdiff {
|
|
|
|
|
function wdiff {
|
|
|
|
|
if zstyle -t ':omz:module:utility:wdiff' color; then
|
|
|
|
|
if (( $+commands[wdiff] )); then
|
|
|
|
|
"$commands[wdiff]" \
|
|
|
|
|
command wdiff \
|
|
|
|
|
--avoid-wraps \
|
|
|
|
|
--start-delete="$(print -n $FG[red])" \
|
|
|
|
|
--end-delete="$(print -n $FG[none])" \
|
|
|
|
@ -18,13 +18,9 @@ if zstyle -t ':omz:module:utility:wdiff' color; then
|
|
|
|
|
| sed 's/^\(@@\( [+-][[:digit:]]*,[[:digit:]]*\)\{2\} @@\)$/;5;6m\10m/g'
|
|
|
|
|
elif (( $+commands[git] )); then
|
|
|
|
|
git --no-pager diff --color=auto --no-ext-diff --no-index --color-words "$@"
|
|
|
|
|
else
|
|
|
|
|
print "zsh: command not found: $0" >&2
|
|
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
unfunction wdiff
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
wdiff "$@"
|
|
|
|
|
else
|
|
|
|
|
command wdiff "$@"
|
|
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|