adam/prezto
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Filter brackets in wdiff highlights.

Browse Source
This commit is contained in:
Sorin Ionescu 2011-12-28 10:34:26 -05:00
parent fb26ff880c
commit 2c68dfe11a
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
alias.zsh
View File

@ -91,12 +91,17 @@ if zstyle -t ':omz:alias:diff' color; then
} }
function wdiff() { function wdiff() {
if (( $+commands[wdiff] )) && (( $+commands[colordiff] )); then if (( $+commands[wdiff] )); then
"$commands[diff]" --unified "$@" | "$commands[wdiff]" --diff-input --avoid-wraps | colordiff --difftype wdiff "$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 elif (( $+commands[git] )); then
git --no-pager diff --color=auto --no-ext-diff --no-index --word-diff "$@" git --no-pager diff --color=auto --no-ext-diff --no-index --color-words "$@"
elif (( $+commands[wdiff] )); then
"$commands[diff]" --unified "$@" | "$commands[wdiff]" --diff-input --avoid-wraps
else else
print "zsh: command not found: $0" >&2 print "zsh: command not found: $0" >&2
fi fi