Update to original mutt 1.10.0

OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=182
This commit is contained in:
2018-07-05 11:57:50 +00:00
committed by Git OBS Bridge
parent 326554610f
commit b202a3811c
20 changed files with 887 additions and 913 deletions

View File

@@ -7,42 +7,42 @@ ask when sending list message replies to author only - Armin Wolfermann (aw)
3 files changed, 26 insertions(+)
--- init.h
+++ init.h 2017-09-11 11:57:46.199273705 +0000
@@ -1662,6 +1662,13 @@ struct Option MuttVars[] = {
** ``$$keywords_standard'' are \fCfalse\fP, mutt will save keywords
** to legacy headers to ensure that it does not lose your labels.
+++ init.h 2018-07-04 13:25:19.570925951 +0000
@@ -1518,6 +1518,13 @@ struct option_t MuttVars[] = {
** from your spool mailbox to your $$mbox mailbox, or as a result of
** a ``$mbox-hook'' command.
*/
+ { "list_reply", DT_QUAD, R_NONE, OPT_LIST_REPLY, MUTT_NO },
+ { "list_reply", DT_QUAD, R_NONE, OPT_LISTREPLY, MUTT_NO },
+ /*
+ ** .pp
+ ** When set, address replies to the mailing list the original message came
+ ** from (instead to the author only). Setting this option to ``ask-yes'' or
+ ** ``ask-no'' will ask if you really intended to reply to the author only.
+ */
{ "mail_check", DT_NUMBER, R_NONE, UL &MailCheck, 5 },
{ "mail_check", DT_NUM, R_NONE, UL &BuffyTimeout, 5 },
/*
** .pp
--- mutt.h
+++ mutt.h 2017-09-11 11:59:08.957770801 +0000
@@ -266,6 +266,7 @@ enum QuadOptionVars
+++ mutt.h 2018-07-04 13:24:58.147315807 +0000
@@ -311,6 +311,7 @@ enum
#endif
OPT_ABORT_NOSUBJECT,
OPT_CRYPT_VERIFY_SIG, /* verify PGP signatures */
+ OPT_LIST_REPLY,
#ifdef USE_NNTP
OPT_POST_MODERATED,
OPT_CATCHUP_NEWSGROUP,
OPT_SUBJECT,
OPT_VERIFYSIG, /* verify PGP signatures */
+ OPT_LISTREPLY,
/* THIS MUST BE THE LAST VALUE. */
OPT_MAX
--- send.c
+++ send.c 2017-09-11 12:00:28.680322715 +0000
@@ -532,6 +532,7 @@ static int include_reply(struct Context
static int default_to(struct Address **to, struct Envelope *env, int flags, int hmfupto)
+++ send.c 2018-07-04 13:28:46.211165353 +0000
@@ -448,6 +448,7 @@ static int include_reply (CONTEXT *ctx,
static int default_to (ADDRESS **to, ENVELOPE *env, int flags, int hmfupto)
{
char prompt[STRING];
+ struct Address *tmp;
if (flags && env->mail_followup_to && hmfupto == MUTT_YES)
if (flags && env->mail_followup_to && hmfupto == MUTT_YES)
{
@@ -545,6 +546,23 @@ static int default_to(struct Address **t
@@ -461,6 +462,23 @@ static int default_to (ADDRESS **to, ENV
if (flags & SENDLISTREPLY)
return 0;
@@ -50,8 +50,8 @@ ask when sending list message replies to author only - Armin Wolfermann (aw)
+ * intended to reply to the author only.
+ */
+ if (!(flags & SENDGROUPREPLY) && mutt_is_list_cc (0, env->to, env->cc)) {
+ switch (query_quadoption (OPT_LIST_REPLY,
+ _("Message came from a mailing list. Reply to author only?")))
+ switch (query_quadoption (OPT_LISTREPLY,
+ _("Message came from a mailing list. Reply to author only?")))
+ {
+ case MUTT_NO:
+ tmp = find_mailing_lists (env->to, env->cc);
@@ -63,6 +63,6 @@ ask when sending list message replies to author only - Armin Wolfermann (aw)
+ }
+ }
+
if (!option(OPT_REPLY_SELF) && mutt_addr_is_user(env->from))
if (!option(OPTREPLYSELF) && mutt_addr_is_user (env->from))
{
/* mail is from the user, assume replying to recipients */