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

utility: Always use 'git' fallback for 'wdiff' wrapper

Browse Source 
Use `git` fallback (if present) even when color is off and `wdiff` is
not present.

Further, remove redundant `function` clause as per Prezto convention.
This commit is contained in:
Indrajit Raychaudhuri 2021-05-10 15:57:37 -05:00 committed by Indrajit Raychaudhuri
parent 6c5657be8e
commit d51e5ce40f
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
modules/utility/functions/wdiff
View File

@ -3,27 +3,30 @@
# #
# Authors: # Authors:
# Sorin Ionescu <sorin.ionescu@gmail.com> # Sorin Ionescu <sorin.ionescu@gmail.com>
# Indrajit Raychaudhuri <irc@indrajit.com>
# #
function wdiff { # function wdiff {
if zstyle -t ':prezto:module:utility:wdiff' color; then
if (( $+commands[wdiff] )); then if zstyle -t ':prezto:module:utility:wdiff' color; then
command wdiff \ if (( $+commands[wdiff] )); then
--avoid-wraps \ command wdiff \
--start-delete="$(print -n $FG[red])" \ --avoid-wraps \
--end-delete="$(print -n $FG[none])" \ --start-delete="$(print -n $FG[red])" \
--start-insert="$(print -n $FG[green])" \ --end-delete="$(print -n $FG[none])" \
--end-insert="$(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' | sed 's/^\(@@\( [+-][[:digit:]]*,[[:digit:]]*\)\{2\} @@\)$/;5;6m\10m/g'
elif (( $+commands[git] )); then elif (( $+commands[git] )); then
command git --no-pager diff --color=auto --no-ext-diff --no-index --color-words "$@" command git --no-pager diff --no-ext-diff --no-index --color=auto --color-words "$@"
else
command wdiff "$@"
fi
else else
command wdiff "$@" command wdiff "$@"
fi fi
} elif (( ! $+commands[wdiff] && $+commands[git] )); then
command git --no-pager diff --no-ext-diff --no-index --color=never "$@"
else
command wdiff "$@"
fi
wdiff "$@" # }