From 7968adaf51574a7cc8462a7130a46407b6eb617b Mon Sep 17 00:00:00 2001 From: Adam Weinberger Date: Wed, 5 Oct 2016 22:55:29 +0000 Subject: Update to 1.7.0. The sidebar patch is now an official part of mutt, and is now controlled by a SIDEBAR option. The trash patch is now a non-optional part of mutt so its knob has disappeared completely. Also, pass maintainership to submitter. Udo has looked after this port for a long time; many thanks to him for all his work! Changes for 1.7.0: ! Improved alignment when using multi-column characters with soft-fill (%*X) and right-justified (%>X) format strings. + The COLUMNS environment variable will be set to the width of the pager when invoking display filters. This can be used in copiousoutput mailcap entries to allow their output to match the pager width. + The sidebar patch has been merged. Please watch for airborne bovine. See the documentation for all the options, or simply enable it with 'set sidebar_visible'. + $mail_check_stats and $mail_check_stats_interval control whether, and how often, to scan for unread, flagged, and total message counts when checking for new mail in mailboxes. These statistics can be displayed in the sidebar and browser. + $trash, when set, specifies the path of the folder where mails marked for deletion will be moved, instead of being irremediably purged. + The function can be used to delete an entry and bypass the trash folder. + $folder_format has new format strings %m and %n, to display total and unread message counts for mailboxes. Note that $mail_check_stats should be enabled to use these. ! When browsing IMAP, %N will now display 'N', instead of the unread message count. Please use %n to display unread messages. PR: 213180 Submitted by: dereks lifeofadishwasher com Approved by: outgoing maintainer (Udo Schweigert) --- mail/mutt/files/extra-patch-pgp-dw | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'mail/mutt/files/extra-patch-pgp-dw') diff --git a/mail/mutt/files/extra-patch-pgp-dw b/mail/mutt/files/extra-patch-pgp-dw index e75bc51e2403..95c0789b7424 100644 --- a/mail/mutt/files/extra-patch-pgp-dw +++ b/mail/mutt/files/extra-patch-pgp-dw @@ -130,7 +130,7 @@ } + + /* otherwise inline won't work...ask for revert */ -+ if ((i = query_quadoption (OPT_PGPMIMEASK, _("Message can't be sent inline. Revert to using PGP/MIME?"))) != M_YES) ++ if ((i = query_quadoption (OPT_PGPMIMEASK, _("Message can't be sent inline. Revert to using PGP/MIME?"))) != MUTT_YES) + return -1; + + /* go ahead with PGP/MIME */ @@ -145,8 +145,8 @@ +++ hook.c Feb 2004 06:07:13 -0000 @@ -119,3 +119,7 @@ int mutt_parse_hook (BUFFER *buf, BUFFER { -+#ifdef M_CRYPTHOOK -+ if (data & (M_FOLDERHOOK | M_SENDHOOK | M_MESSAGEHOOK | M_ACCOUNTHOOK | M_REPLYHOOK | M_CRYPTHOOK)) ++#ifdef MUTT_CRYPTHOOK ++ if (data & (MUTT_FOLDERHOOK | MUTT_SENDHOOK | MUTT_MESSAGEHOOK | MUTT_ACCOUNTHOOK | MUTT_REPLYHOOK | MUTT_CRYPTHOOK)) +#else if (data & (M_FOLDERHOOK | M_SENDHOOK | M_MESSAGEHOOK | M_ACCOUNTHOOK | M_REPLYHOOK)) +#endif @@ -167,7 +167,7 @@ + { + if (!hook->command) + continue; -+ if (!(hook->type & M_CRYPTHOOK)) ++ if (!(hook->type & MUTT_CRYPTHOOK)) + continue; + + if ((regexec (hook->rx.rx, adr->mailbox, 0, NULL, 0) == 0) ^ hook->rx.not) @@ -250,7 +250,7 @@ @@ -1423,11 +1484,8 @@ struct option_t MuttVars[] = { */ - { "pgp_create_traditional", DT_QUAD, R_NONE, OPT_PGPTRADITIONAL, M_NO }, -+ { "pgp_mime_ask", DT_QUAD, R_NONE, OPT_PGPMIMEASK, M_NO }, ++ { "pgp_mime_ask", DT_QUAD, R_NONE, OPT_PGPMIMEASK, MUTT_NO }, /* ** .pp - ** This option controls whether Mutt generates old-style inline PGP @@ -373,7 +373,7 @@ - if (is_numerical_keyid (keyID)) + keyID = (char *)hook->data; + snprintf (buf, sizeof (buf), _("Use keyID = \"%s\" for %s?"), keyID, p->mailbox); -+ if (!option(OPTCRYPTCONFIRMHOOK) || (r = mutt_yesorno (buf, M_YES)) == M_YES) ++ if (!option(OPTCRYPTCONFIRMHOOK) || (r = mutt_yesorno (buf, MUTT_YES)) == MUTT_YES) { - if (strncmp (keyID, "0x", 2) == 0) - keyID += 2; -- cgit v1.2.3