From d51e5ce40f3b10eb6ef0e9bc9aa9131e3db26db6 Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Mon, 10 May 2021 15:57:37 -0500
Subject: [PATCH] utility: Always use 'git' fallback for 'wdiff' wrapper

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

Further, remove redundant `function` clause as per Prezto convention.
---
 modules/utility/functions/wdiff | 37 ++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/modules/utility/functions/wdiff b/modules/utility/functions/wdiff
index ebfad0b..f1de659 100644
--- a/modules/utility/functions/wdiff
+++ b/modules/utility/functions/wdiff
@@ -3,27 +3,30 @@
 #
 # Authors:
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
+#   Indrajit Raychaudhuri <irc@indrajit.com>
 #
 
-function wdiff {
-  if zstyle -t ':prezto:module:utility:wdiff' color; then
-    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])" \
-        "$@" \
+# function wdiff {
+
+if zstyle -t ':prezto:module:utility:wdiff' color; then
+  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
-      command git --no-pager diff --color=auto --no-ext-diff --no-index --color-words "$@"
-    else
-      command wdiff "$@"
-    fi
+  elif (( $+commands[git] )); then
+    command git --no-pager diff --no-ext-diff --no-index --color=auto --color-words "$@"
   else
     command wdiff "$@"
   fi
-}
+elif (( ! $+commands[wdiff] && $+commands[git] )); then
+    command git --no-pager diff --no-ext-diff --no-index --color=never "$@"
+else
+  command wdiff "$@"
+fi
 
-wdiff "$@"
+# }