summaryrefslogtreecommitdiffstats
path: root/src/args.rs
diff options
context:
space:
mode:
authorAndrew Gallant <jamslam@gmail.com>2016-09-29 16:49:44 -0400
committerGitHub <noreply@github.com>2016-09-29 16:49:44 -0400
commitcee2f09a6d94a98dceac97d51f75cc0575c264b6 (patch)
treed838a7435ea01e6bf869e3d02cb0480444377a4e /src/args.rs
parentced777e91f535fe7bef02440a9734fd2eac5fc52 (diff)
parent5943b1effe8e11d265dad52a27e69fcc1bf8484d (diff)
Merge pull request #121 from lilydjwg/master
if --color always, always print with color, even when --vimgrep is given
Diffstat (limited to 'src/args.rs')
-rw-r--r--src/args.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/args.rs b/src/args.rs
index 73675ff4..6cca1256 100644
--- a/src/args.rs
+++ b/src/args.rs
@@ -358,12 +358,14 @@ impl RawArgs {
self.flag_threads
};
let color =
- if self.flag_vimgrep {
+ if self.flag_color == "always" {
+ true
+ } else if self.flag_vimgrep {
false
} else if self.flag_color == "auto" {
atty::on_stdout() || self.flag_pretty
} else {
- self.flag_color == "always"
+ false
};
let mut with_filename = self.flag_with_filename;