X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-ui%2Fcurs_main.c;h=f74a23e95c01b1e5d214c091db4817565d2895ed;hp=ddb5be50334669a4c19102789a8aaab84f3992a4;hb=c621d41d614275fb6265ab8184a825a72b5a52b4;hpb=3433b743b81494973ff59ab796ce2bce63469d19 diff --git a/lib-ui/curs_main.c b/lib-ui/curs_main.c index ddb5be5..f74a23e 100644 --- a/lib-ui/curs_main.c +++ b/lib-ui/curs_main.c @@ -22,6 +22,7 @@ #include "menu.h" #include "mutt.h" +#include "pattern.h" #include "alias.h" #include "sort.h" #include "recvattach.h" @@ -924,15 +925,14 @@ int mutt_index_menu (void) if (op == OP_TOGGLE_READ) { char buffer[LONG_STRING]; - if (!Context->pattern - || strncmp (Context->pattern, "!~R!~D~s", 8) != 0) { + if (m_strncmp (Context->pattern, "!~R!~D~s", 8) != 0) { snprintf (buffer, sizeof (buffer), "!~R!~D~s%s", Context->pattern ? Context->pattern : ".*"); set_option (OPTHIDEREAD); } else { m_strcpy(buf, sizeof(buf), Context->pattern + 8); - if (!*buf || strncmp (buf, ".*", 2) == 0) + if (m_strncmp (buf, ".*", 2) == 0) snprintf (buf, sizeof (buf), "~A"); unset_option (OPTHIDEREAD); } @@ -2316,9 +2316,6 @@ int mutt_index_menu (void) if (menu->menu == MENU_PAGER) { menu->menu = MENU_MAIN; menu->redraw = REDRAW_FULL; -#if 0 - set_option (OPTWEED); /* turn header weeding back on. */ -#endif } if (done)