dcarrillo/prezto
1
0
Fork 0
mirror of https://github.com/dcarrillo/prezto.git synced 2024-12-23 04:28:00 +00:00
Code Issues Releases Wiki Activity

[Fix #195] Fallback to the default command

Browse Source
This commit is contained in:
Sorin Ionescu 2012-06-13 14:08:57 -04:00
parent 7dc55a8304
commit e4be6d633f
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/utility/functions/diff
View File

@ -11,6 +11,8 @@ function diff {
command 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
command diff --unified "$@"
fi fi
else else
command diff --unified "$@" command diff --unified "$@"

2
modules/utility/functions/make
View File

@ -9,6 +9,8 @@ function make {
if zstyle -t ':omz:module:utility:make' color; then if zstyle -t ':omz:module:utility:make' color; then
if (( $+commands[colormake] )); then if (( $+commands[colormake] )); then
colormake "$@" colormake "$@"
else
command make "$@"
fi fi
else else
command make "$@" command make "$@"

2
modules/utility/functions/wdiff
View File

@ -18,6 +18,8 @@ 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
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
command wdiff "$@"
fi fi
else else
command wdiff "$@" command wdiff "$@"