dcarrillo/prezto
1
0
Fork 0
mirror of https://github.com/dcarrillo/prezto.git synced 2025-06-14 11:51:42 +00:00
Code Issues 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
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/utility/functions/wdiff
View File

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