diff options
| author | Andrew Janke <andrew@apjanke.net> | 2015-08-17 20:59:39 -0400 |
|---|---|---|
| committer | Andrew Janke <andrew@apjanke.net> | 2015-08-17 20:59:39 -0400 |
| commit | 00eb4658304b010afdfa87f74be673c8aced4961 (patch) | |
| tree | 3d9e7f95f21265c3c60f10cdca720308bb2421c6 /lib/grep.zsh | |
| parent | 47d19cc56425aa7c550d845726111ee8bd9520d1 (diff) | |
| parent | 192de6bcffb0294e19f4203f6f7dc1a7f3e427be (diff) | |
| download | zsh-00eb4658304b010afdfa87f74be673c8aced4961.tar.gz zsh-00eb4658304b010afdfa87f74be673c8aced4961.tar.bz2 zsh-00eb4658304b010afdfa87f74be673c8aced4961.zip | |
Merge branch 'master' into fold-terminalapp-plugin-into-termsupport
Diffstat (limited to 'lib/grep.zsh')
| -rw-r--r-- | lib/grep.zsh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/grep.zsh b/lib/grep.zsh index 348ebe623..3fa103d19 100644 --- a/lib/grep.zsh +++ b/lib/grep.zsh @@ -3,8 +3,12 @@ grep-flag-available() { echo | grep $1 "" >/dev/null 2>&1 } +GREP_OPTIONS="" + # color grep results -GREP_OPTIONS="--color=auto" +if grep-flag-available --color=auto; then + GREP_OPTIONS+=" --color=auto" +fi # ignore VCS folders (if the necessary grep flags are available) VCS_FOLDERS="{.bzr,.cvs,.git,.hg,.svn}" |