Sorin Ionescu
13 years ago
4 changed files with 74 additions and 41 deletions
@ -0,0 +1,23 @@
@@ -0,0 +1,23 @@
|
||||
# |
||||
# Highlights diff output. |
||||
# |
||||
# Authors: |
||||
# Sorin Ionescu <sorin.ionescu@gmail.com> |
||||
# |
||||
|
||||
if zstyle -t ':omz:module:utility:diff' color; then |
||||
function diff { |
||||
if (( $+commands[colordiff] )); then |
||||
"$commands[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 "$@" |
||||
|
@ -0,0 +1,21 @@
@@ -0,0 +1,21 @@
|
||||
# |
||||
# Highlights make output. |
||||
# |
||||
# Authors: |
||||
# Sorin Ionescu <sorin.ionescu@gmail.com> |
||||
# |
||||
|
||||
if zstyle -t ':omz:module:utility:make' color; then |
||||
function make { |
||||
if (( $+commands[colormake] )); then |
||||
colormake "$@" |
||||
else |
||||
"$commands[make]" "$@" |
||||
fi |
||||
} |
||||
else |
||||
unfunction make |
||||
fi |
||||
|
||||
make "$@" |
||||
|
@ -0,0 +1,30 @@
@@ -0,0 +1,30 @@
|
||||
# |
||||
# Highlights wdiff output. |
||||
# |
||||
# Authors: |
||||
# Sorin Ionescu <sorin.ionescu@gmail.com> |
||||
# |
||||
|
||||
if zstyle -t ':omz:module:utility:wdiff' color; then |
||||
function wdiff { |
||||
if (( $+commands[wdiff] )); then |
||||
"$commands[wdiff]" \ |
||||
--avoid-wraps \ |
||||
--start-delete="$(print -n $FG[red])" \ |
||||
--end-delete="$(print -n $FG[none])" \ |
||||
--start-insert="$(print -n $FG[green])" \ |
||||
--end-insert="$(print -n $FG[none])" \ |
||||
"$@" \ |
||||
| 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 "$@" |
||||
|
Loading…
Reference in new issue