[utility] Simplify enabling 'diff' color conditions in wrapper function

Nested `if` can be removed for simple cases like these. Also, doc cleanup.
adamkiss · Nov 13, 2017 · 2436806 · 2436806
1 parent 96bbb31
commit 2436806
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/modules/utility/README.md b/modules/utility/README.md
@@ -153,7 +153,7 @@ Functions
 
 ### Developer
 
-  - `diff` highlights diff output (requires `colordiff` or `Git`).
+  - `diff` highlights diff output (requires `colordiff`).
   - `make` highlights make output (requires `colormake`).
   - `wdiff` highlights wdiff output (requires `wdiff `or `Git`).
 

diff --git a/modules/utility/functions/diff b/modules/utility/functions/diff
@@ -6,12 +6,9 @@
 #
 
 function diff {
-  if zstyle -t ':prezto:module:utility:diff' color; then
-    if (( $+commands[colordiff] )); then
+  if zstyle -t ':prezto:module:utility:diff' color \
+    && (( $+commands[colordiff] )); then
       command colordiff "$@"
-    else
-      command diff "$@"
-    fi
   else
     command diff "$@"
   fi