mutt: Change sidebar_spoolfile coloring to be lower precedence.

[Brendan Cully]

changeset: 6879:d6c10244793f
user:      Kevin McCarthy <ke...@8t8.us>
date:      Sat Dec 03 15:24:32 2016 -0800
link:      http://dev.mutt.org/hg/mutt/rev/d6c10244793f

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.

diffs (20 lines):

diff -r d72caeecf4af -r d6c10244793f sidebar.c
--- a/sidebar.c Tue Nov 29 17:48:33 2016 -0800
+++ b/sidebar.c Sat Dec 03 15:24:32 2016 -0800
@@ -567,13 +567,13 @@
     }
     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);