Merge remote-tracking branch 'upstream/master'

1ca4e214 · Bob Williams · d70e7329 · 315099d7 · 1ca4e214
Commit 1ca4e214 authored Mar 23, 2014 by Bob Williams
--- a/lib/grep.zsh
+++ b/lib/grep.zsh
@@ -8,5 +8,6 @@ GREP_OPTIONS=
 for PATTERN in .cvs .git .hg .svn; do
    GREP_OPTIONS+="--exclude-dir=$PATTERN "
 done
-export GREP_OPTIONS+='--color=auto '
+GREP_OPTIONS+="--color=auto"
+export GREP_OPTIONS="$GREP_OPTIONS"
 export GREP_COLOR='1;32'