[#149] Simplify diff, wdiff, make

modules/utility/functions/diff

@@ -5,19 +5,15 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
-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 "$@"
+    fi
   else
-      "$commands[diff]" --unified "$@"
+    command diff --unified "$@"
   fi
-  }
-else
-  unfunction diff
-fi
-
-diff --unified "$@"
+}
 

modules/utility/functions/make

@@ -5,17 +5,13 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
-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 "$@"
+    fi
   else
-      "$commands[make]" "$@"
+    command make "$@"
   fi
-  }
-else
-  unfunction make
-fi
-
-make "$@"
+}
 

modules/utility/functions/wdiff

@@ -5,10 +5,10 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
-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 "$@"
+    fi
   else
-      print "zsh: command not found: $0" >&2
+    command wdiff "$@"
   fi
-  }
-else
-  unfunction wdiff
-fi
-
-wdiff "$@"
+}