prezto/lib/grep.zsh

if [[ "$DISABLE_COLOR" != 'true' ]]; then
  if [[ -z "$GREP_OPTIONS" ]]; then
    export GREP_OPTIONS='--color=auto'
  fi
  if [[ -z "$GREP_COLOR" ]]; then
    export GREP_COLOR='37;45'
  fi
else
  export GREP_OPTIONS='--color=none'
  export GREP_COLOR=''
fi
Cleaned up lib/ and removed trailing white space everywhere. Conflicts: oh-my-zsh.sh 2011-06-01 06:48:26 +00:00			`if [[ "$DISABLE_COLOR" != 'true' ]]; then`
			`if [[ -z "$GREP_OPTIONS" ]]; then`
			`export GREP_OPTIONS='--color=auto'`
			`fi`
			`if [[ -z "$GREP_COLOR" ]]; then`
			`export GREP_COLOR='37;45'`
			`fi`
Merged custom/ and lib/. Conflicts: custom/aliases.zsh custom/functions.zsh custom/grep.zsh 2011-05-30 22:39:04 +00:00			`else`
			`export GREP_OPTIONS='--color=none'`
			`export GREP_COLOR=''`
Fix for dumb terminals like Vim's. 2011-02-27 15:13:57 +00:00			`fi`
Merged custom/ and lib/. Conflicts: custom/aliases.zsh custom/functions.zsh custom/grep.zsh 2011-05-30 22:39:04 +00:00