forked from sorin-ionescu/prezto
-
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[sorin-ionescu#149] Simplify diff, wdiff, make
- Loading branch information
1 parent
c17b8c6
commit 7b7a9bc
Showing
3 changed files
with
20 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,19 +5,15 @@ | |
| # Sorin Ionescu <[email protected]> | ||
| # | ||
|
|
||
| if zstyle -t ':omz:module:utility:diff' color; then | ||
| function diff { | ||
| function diff { | ||
| if zstyle -t ':omz:module:utility:diff' color; then | ||
| if (( $+commands[colordiff] )); then | ||
| "$commands[diff]" --unified "$@" | colordiff --difftype diffu | ||
| command 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 "$@" | ||
| else | ||
| command diff --unified "$@" | ||
| fi | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,17 +5,13 @@ | |
| # Sorin Ionescu <[email protected]> | ||
| # | ||
|
|
||
| if zstyle -t ':omz:module:utility:make' color; then | ||
| function make { | ||
| function make { | ||
| if zstyle -t ':omz:module:utility:make' color; then | ||
| if (( $+commands[colormake] )); then | ||
| colormake "$@" | ||
| else | ||
| "$commands[make]" "$@" | ||
| fi | ||
| } | ||
| else | ||
| unfunction make | ||
| fi | ||
|
|
||
| make "$@" | ||
| else | ||
| command make "$@" | ||
| fi | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,10 +5,10 @@ | |
| # Sorin Ionescu <[email protected]> | ||
| # | ||
|
|
||
| if zstyle -t ':omz:module:utility:wdiff' color; then | ||
| function wdiff { | ||
| function wdiff { | ||
| if zstyle -t ':omz:module:utility:wdiff' color; then | ||
| if (( $+commands[wdiff] )); then | ||
| "$commands[wdiff]" \ | ||
| command wdiff \ | ||
| --avoid-wraps \ | ||
| --start-delete="$(print -n $FG[red])" \ | ||
| --end-delete="$(print -n $FG[none])" \ | ||
|
|
@@ -18,13 +18,9 @@ if zstyle -t ':omz:module:utility:wdiff' color; then | |
| | 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 "$@" | ||
| else | ||
| command wdiff "$@" | ||
| fi | ||
| } | ||
|
|
||