sqozz/prezto_config
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[#149] Simplify diff, wdiff, make

Browse source
This commit is contained in:
Sorin Ionescu 2012-06-03 17:53:02 -04:00
parent 45ab153c64
commit 761ba12813
3 changed files with 20 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
modules/utility/functions/diff
View file

@ -5,19 +5,15 @@
# Sorin Ionescu <sorin.ionescu@gmail.com> # 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 if (( $+commands[colordiff] )); then
"$commands[diff]" --unified "$@" | colordiff --difftype diffu command diff --unified "$@" | colordiff --difftype diffu
elif (( $+commands[git] )); then elif (( $+commands[git] )); then
git --no-pager diff --color=auto --no-ext-diff --no-index "$@" git --no-pager diff --color=auto --no-ext-diff --no-index "$@"
else
"$commands[diff]" --unified "$@"
fi fi
} else
else command diff --unified "$@"
unfunction diff fi
fi }
diff --unified "$@"

16
modules/utility/functions/make
View file

@ -5,17 +5,13 @@
# Sorin Ionescu <sorin.ionescu@gmail.com> # 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 if (( $+commands[colormake] )); then
colormake "$@" colormake "$@"
else
"$commands[make]" "$@"
fi fi
} else
else command make "$@"
unfunction make fi
fi }
make "$@"

18
modules/utility/functions/wdiff
View file

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