aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/builtin_set_color.cpp
diff options
context:
space:
mode:
authorGravatar Kurtis Rader <krader@skepticism.us>2016-04-04 16:55:40 -0700
committerGravatar Kurtis Rader <krader@skepticism.us>2016-04-04 16:55:40 -0700
commit8f33b55ccc501f8460d4d5ff8bd5ef7861a0ee3a (patch)
tree86707bb4fad74a0bd393b36ff4cd58eddea773f5 /src/builtin_set_color.cpp
parent484c1484c9ae01354b1910bae5ed8a729e00b3be (diff)
remove unused special color "ignore"
Resolve lint warning about unused method "rgb_color_t::ignore()". Fixes #2893
Diffstat (limited to 'src/builtin_set_color.cpp')
-rw-r--r--src/builtin_set_color.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/builtin_set_color.cpp b/src/builtin_set_color.cpp
index b3c7ebaf..449e3895 100644
--- a/src/builtin_set_color.cpp
+++ b/src/builtin_set_color.cpp
@@ -137,7 +137,7 @@ static int builtin_set_color(parser_t &parser, io_streams_t &streams, wchar_t **
for (; w.woptind < argc; w.woptind++)
{
rgb_color_t fg = rgb_color_t(argv[w.woptind]);
- if (fg.is_none() || fg.is_ignore())
+ if (fg.is_none())
{
streams.err.append_format(_(L"%ls: Unknown color '%ls'\n"), argv[0], argv[w.woptind]);
return STATUS_BUILTIN_ERROR;
@@ -155,10 +155,10 @@ static int builtin_set_color(parser_t &parser, io_streams_t &streams, wchar_t **
// #1323: We may have multiple foreground colors. Choose the best one.
// If we had no foreground coor, we'll get none(); if we have at least one we expect not-none
const rgb_color_t fg = best_color(fgcolors, output_get_color_support());
- assert(fgcolors.empty() || !(fg.is_none() || fg.is_ignore()));
+ assert(fgcolors.empty() || !fg.is_none());
const rgb_color_t bg = rgb_color_t(bgcolor ? bgcolor : L"");
- if (bgcolor && (bg.is_none() || bg.is_ignore()))
+ if (bgcolor && bg.is_none())
{
streams.err.append_format(_(L"%ls: Unknown color '%ls'\n"), argv[0], bgcolor);
return STATUS_BUILTIN_ERROR;