From: Kevin McCarthy <kevin@8t8.us>
Date: Sat, 3 Dec 2016 23:24:32 +0000 (-0800)
Subject: Change sidebar_spoolfile coloring to be lower precedence.
X-Git-Tag: mutt-1-8-rel~63
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9445703193640a5cf449b2485d30ccd526601289;p=mutt

Change sidebar_spoolfile coloring to be lower precedence.

Give sidebar_new and sidebar_flagged higher precedence than
sidebar_spoolfile, so that new and flagged message colors will show up
for the spoolfile in the sidebar.

Thanks to Till Smejkal for the original patch.
---

diff --git a/sidebar.c b/sidebar.c
index b8e69931..2afbbb32 100644
--- a/sidebar.c
+++ b/sidebar.c
@@ -567,13 +567,13 @@ static void draw_sidebar (int num_rows, int num_cols, int div_width)
     }
     else if (entryidx == HilIndex)
       SETCOLOR(MT_COLOR_HIGHLIGHT);
-    else if ((ColorDefs[MT_COLOR_SB_SPOOLFILE] != 0) &&
-               (mutt_strcmp (b->path, Spoolfile) == 0))
-      SETCOLOR(MT_COLOR_SB_SPOOLFILE);
     else if ((b->msg_unread > 0) || (b->new))
       SETCOLOR(MT_COLOR_NEW);
     else if (b->msg_flagged > 0)
       SETCOLOR(MT_COLOR_FLAGGED);
+    else if ((ColorDefs[MT_COLOR_SB_SPOOLFILE] != 0) &&
+               (mutt_strcmp (b->path, Spoolfile) == 0))
+      SETCOLOR(MT_COLOR_SB_SPOOLFILE);
     else
       SETCOLOR(MT_COLOR_NORMAL);