diff options
| author | David Runge <dave@sleepmap.de> | 2018-06-02 12:27:33 +0200 |
|---|---|---|
| committer | David Runge <dave@sleepmap.de> | 2018-06-02 12:27:33 +0200 |
| commit | df6f6c75ac7e0a8951a7984729e12b8d98501591 (patch) | |
| tree | 35f4625161fc828caa0ed2d6d9d6ba9724a77bd8 /.zsh.functions | |
| parent | 4825cc70c47952fa707810a26f6bdc4e386cda94 (diff) | |
| download | dotfiles-df6f6c75ac7e0a8951a7984729e12b8d98501591.tar.gz dotfiles-df6f6c75ac7e0a8951a7984729e12b8d98501591.tar.bz2 dotfiles-df6f6c75ac7e0a8951a7984729e12b8d98501591.tar.xz dotfiles-df6f6c75ac7e0a8951a7984729e12b8d98501591.zip | |
.zsh.functions/02_utility.zsh: Removing annoying diff shadowing.
Diffstat (limited to '.zsh.functions')
| -rw-r--r-- | .zsh.functions/02_utility.zsh | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/.zsh.functions/02_utility.zsh b/.zsh.functions/02_utility.zsh index c08ce10..05b77bc 100644 --- a/.zsh.functions/02_utility.zsh +++ b/.zsh.functions/02_utility.zsh @@ -33,17 +33,6 @@ function psu { ps -U "${1:-$LOGNAME}" -o 'pid,%cpu,%mem,command' "${(@)argv[2,-1]}" } -# Highlights diff output. -function diff { - if (( $+commands[colordiff] )); then - command diff --unified "$@" | colordiff --difftype diffu - elif (( $+commands[git] )); then - git --no-pager diff --color=auto --no-ext-diff --no-index "$@" - else - command diff --unified "$@" - fi -} - # Highlights make output. function make { if (( $+commands[colormake] )); then @@ -53,24 +42,6 @@ function make { fi } -# Highlights wdiff output. -function wdiff { - if (( $+commands[wdiff] )); then - command 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 - command wdiff "$@" - fi -} - # Lists the contents of archives. function lsarchive { while (( $# > 0 )); do |