MFH: r552116

incorporate a side fix from upstream

PR:		250097
Submitted by:	Michael Bueker <m.bueker@berlin.de>
This commit is contained in:
Baptiste Daroussin 2020-10-12 10:30:19 +00:00
parent e3e4f690c4
commit 80e5336083
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/branches/2020Q4/; revision=552117
2 changed files with 21 additions and 0 deletions

View File

@ -2,6 +2,7 @@
PORTNAME= neomutt
PORTVERSION= 20200925
PORTREVISION= 1
CATEGORIES= mail
MAINTAINER= bapt@FreeBSD.org

View File

@ -0,0 +1,20 @@
--- sidebar/functions.c.orig 2020-10-04 15:20:02 UTC
+++ sidebar/functions.c
@@ -72,7 +72,7 @@ static struct SbEntry **next_new(struct
struct SbEntry **sbep = NULL;
ARRAY_FOREACH_FROM_TO(sbep, &wdata->entries, begin, end)
{
- if ((*sbep)->mailbox->has_new && (*sbep)->mailbox->msg_unread != 0)
+ if ((*sbep)->mailbox->has_new || (*sbep)->mailbox->msg_unread != 0)
return sbep;
}
return NULL;
@@ -143,7 +143,7 @@ static struct SbEntry **prev_new(struct
struct SbEntry **sbep = NULL, **prev = NULL;
ARRAY_FOREACH_FROM_TO(sbep, &wdata->entries, begin, end)
{
- if ((*sbep)->mailbox->has_new && (*sbep)->mailbox->msg_unread != 0)
+ if ((*sbep)->mailbox->has_new || (*sbep)->mailbox->msg_unread != 0)
prev = sbep;
}