[#149] Simplify diff, wdiff, make

main
Sorin Ionescu 13 years ago
parent 45ab153c64
commit 761ba12813

@ -5,19 +5,15 @@
# Sorin Ionescu <sorin.ionescu@gmail.com>
#
if zstyle -t ':omz:module:utility:diff' color; then
function diff {
function diff {
if zstyle -t ':omz:module:utility:diff' color; then
if (( $+commands[colordiff] )); then
"$commands[diff]" --unified "$@" | colordiff --difftype diffu
command diff --unified "$@" | colordiff --difftype diffu
elif (( $+commands[git] )); then
git --no-pager diff --color=auto --no-ext-diff --no-index "$@"
else
"$commands[diff]" --unified "$@"
fi
}
else
unfunction diff
fi
diff --unified "$@"
else
command diff --unified "$@"
fi
}

@ -5,17 +5,13 @@
# Sorin Ionescu <sorin.ionescu@gmail.com>
#
if zstyle -t ':omz:module:utility:make' color; then
function make {
function make {
if zstyle -t ':omz:module:utility:make' color; then
if (( $+commands[colormake] )); then
colormake "$@"
else
"$commands[make]" "$@"
fi
}
else
unfunction make
fi
make "$@"
else
command make "$@"
fi
}

@ -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
}

Loading…
Cancel
Save