From: David Champion <dgc@bikeshed.us>
Date: Tue, 30 Aug 2016 23:11:45 +0000 (-0700)
Subject: Update a confusing and obsolete comment.
X-Git-Tag: neomutt-20170225~32^2~129
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2322b57e9c528381572378c0008bc424a61c67a5;p=neomutt

Update a confusing and obsolete comment.

This 2004 comment in sort.h predicted what has recently come to pass, so
I'm reframing it just to document for future devs what's going on with
this oddball flag.
---

diff --git a/sort.h b/sort.h
index 26afdc628..0706261ec 100644
--- a/sort.h
+++ b/sort.h
@@ -36,9 +36,19 @@
 #define SORT_FLAGGED	17
 #define SORT_PATH	18
 
-/* dgc: Sort & SortAux are shorts, so I'm bumping these bitflags up from
- * bits 4 & 5 to bits 8 & 9 to make room for more sort keys in the future. */
-#define SORT_MASK	0xff
+/* Sort and sort_aux are shorts, and are a composite of a
+ * constant sort operation number and a set of compounded
+ * bitflags.
+ *
+ * Everything below SORT_MASK is a constant. There's room for
+ * SORT_MASK constant SORT_ values.
+ *
+ * Everything above is a bitflag. It's OK to move SORT_MASK
+ * down by powers of 2 if we need more, so long as we don't
+ * collide with the constants above. (Or we can just expand
+ * sort and sort_aux to uint32_t.)
+ */
+#define SORT_MASK	((1<<8) - 1)
 #define SORT_REVERSE	(1<<8)
 #define SORT_LAST	(1<<9)