Merge remote-tracking branch 'upstream/master'

2014-03-23 14:26:06 -04:00 · 2014-03-23 14:26:06 -04:00 · 1ca4e2146b
commit 1ca4e2146b
parent d70e732944 315099d778
1 changed files with 3 additions and 2 deletions
--- 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 '
-export GREP_COLOR='1;32'
+GREP_OPTIONS+="--color=auto"
+export GREP_OPTIONS="$GREP_OPTIONS"
+export GREP_COLOR='1;32'