657ad0523d5a29e0bdc8af0cd63c23ac597406e8

 1diff --git a/lib/theme-and-appearance.zsh b/lib/theme-and-appearance.zsh
 2index 00947f72dc4e1f563ed8ebc836640986984862c4..9b908bef00bf84ebf43655e17f7602a25818bf6a 100644
 3--- a/lib/theme-and-appearance.zsh
 4+++ b/lib/theme-and-appearance.zsh
 5@@ -41,7 +41,11 @@ fi
 6 
 7 # enable diff color if possible.
 8 if command diff --color /dev/null /dev/null &>/dev/null; then
 9-  alias diff='diff --color'
10+  function color-diff {
11+    diff --color $@
12+  }
13+  alias diff="color-diff"
14+  compdef _diff color-diff # compdef is already loaded by this point
15 fi
16 
17 setopt auto_cd