From 640d3efb4fef85ade29a2a0768c67897bc2b4d4c Mon Sep 17 00:00:00 2001 From: Kevin McCarthy Date: Tue, 28 Jun 2016 16:06:22 -0700 Subject: [PATCH] Remove unused SORT_DESC. This came over with the sidebar patch, but I believe is only used by the notmuch extension. --- init.h | 2 -- sidebar.c | 3 +-- sort.h | 5 ++--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/init.h b/init.h index add9e806..61915d5a 100644 --- a/init.h +++ b/init.h @@ -2796,7 +2796,6 @@ struct option_t MuttVars[] = { ** .dd alpha (alphabetically) ** .dd count (all message count) ** .dd date - ** .dd desc (description) ** .dd new (new message count) ** .dd size ** .dd unsorted @@ -3811,7 +3810,6 @@ const struct mapping_t SortKeyMethods[] = { const struct mapping_t SortSidebarMethods[] = { { "alpha", SORT_PATH }, { "count", SORT_COUNT }, - { "desc", SORT_DESC }, { "flagged", SORT_FLAGGED }, { "mailbox-order", SORT_ORDER }, { "name", SORT_PATH }, diff --git a/sidebar.c b/sidebar.c index 066e734e..901986ea 100644 --- a/sidebar.c +++ b/sidebar.c @@ -439,7 +439,6 @@ static void sort_buffy_array (BUFFY **arr, int arr_len) short ssm = (SidebarSortMethod & SORT_MASK); if ((ssm == SORT_COUNT) || (ssm == SORT_COUNT_NEW) || - (ssm == SORT_DESC) || (ssm == SORT_FLAGGED) || (ssm == SORT_PATH)) qsort (arr, arr_len, sizeof (*arr), cb_qsort_buffy); @@ -873,7 +872,7 @@ const char *mutt_sb_get_highlight (void) } /** - * mutt_sb_set_open_buffy - Set the OpnBuffy based on a the global Context + * mutt_sb_set_open_buffy - Set the OpnBuffy based on the global Context * * Search through the list of mailboxes. If a BUFFY has a matching path, set * OpnBuffy to it. diff --git a/sort.h b/sort.h index f24491b9..26afdc62 100644 --- a/sort.h +++ b/sort.h @@ -33,9 +33,8 @@ #define SORT_SPAM 14 #define SORT_COUNT 15 #define SORT_COUNT_NEW 16 -#define SORT_DESC 17 -#define SORT_FLAGGED 18 -#define SORT_PATH 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. */ -- 2.40.0