From 464a8d20a1e05b256d2b0a9d05d231c30160835d Mon Sep 17 00:00:00 2001 From: Zhiming Wang Date: Thu, 9 Jul 2015 17:53:58 -0700 Subject: [PATCH] utility module: fix/improve colordiff call in diff The new call is compatible with colordiff v1.0.8 - v.1.0.15 (might be compatible with even earlier versions, but not tested), while the original one breaks down under v1.0.14 and v1.0.15. See https://github.com/daveewart/colordiff/issues/22. --- modules/utility/functions/diff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/utility/functions/diff b/modules/utility/functions/diff index 8347899..d5dd360 100644 --- a/modules/utility/functions/diff +++ b/modules/utility/functions/diff @@ -8,7 +8,7 @@ function diff { if zstyle -t ':prezto:module:utility:diff' color; then if (( $+commands[colordiff] )); then - command diff --unified "$@" | colordiff --difftype diffu + command colordiff --unified "$@" elif (( $+commands[git] )); then git --no-pager diff --color=auto --no-ext-diff --no-index "$@" else