Page MenuHomeFreeBSD
Differential D12282 Diff 32875 head/mail/mutt/files/extra-patch-reverse_reply

Changeset View

Standalone View

View Options

head/mail/mutt/files/extra-patch-reverse_reply

--- PATCHES.orig 2017-06-03 23:21:18 UTC --- PATCHES.orig 2017-09-04 23:35:30 UTC
+++ PATCHES +++ PATCHES
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+patch-1.5.6.cb.reverse_reply.2 +patch-1.5.6.cb.reverse_reply.2
--- init.h.orig 2017-06-03 23:21:18 UTC --- init.h.orig 2017-09-04 23:35:27 UTC
+++ init.h +++ init.h
@@ -2588,6 +2588,13 @@ struct option_t MuttVars[] = { @@ -2687,6 +2687,13 @@ struct option_t MuttVars[] = {
** possibly including eventual real names. When it is \fIunset\fP, mutt will ** possibly including eventual real names. When it is \fIunset\fP, mutt will
** override any such real names with the setting of the $$realname variable. ** override any such real names with the setting of the $$realname variable.
*/ */
+ { "reverse_reply", DT_BOOL, R_NONE, OPTREVREPLY, 0 }, + { "reverse_reply", DT_BOOL, R_NONE, OPTREVREPLY, 0 },
+ /* + /*
+ ** .pp + ** .pp
+ ** When set, this variable uses the name from your aliases in the To and Cc + ** When set, this variable uses the name from your aliases in the To and Cc
+ ** headers of reply mails you send, like $reverse_alias does in the index. + ** headers of reply mails you send, like $reverse_alias does in the index.
+ ** When unset, the headers taken from the original mail are left unchanged. + ** When unset, the headers taken from the original mail are left unchanged.
+ */ + */
{ "rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, 0 }, { "rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, 0 },
/* /*
** .pp ** .pp
--- mutt.h.orig 2017-06-03 23:21:23 UTC --- mutt.h.orig 2017-09-04 23:35:27 UTC
+++ mutt.h +++ mutt.h
@@ -440,6 +440,7 @@ enum @@ -448,6 +448,7 @@ enum
OPTREVALIAS, OPTREVALIAS,
OPTREVNAME, OPTREVNAME,
OPTREVREAL, OPTREVREAL,
+ OPTREVREPLY, + OPTREVREPLY,
OPTRFC2047PARAMS, OPTRFC2047PARAMS,
OPTSAVEADDRESS, OPTSAVEADDRESS,
OPTSAVEEMPTY, OPTSAVEEMPTY,
--- protos.h.orig 2017-05-30 19:27:53 UTC --- protos.h.orig 2017-09-04 23:35:27 UTC
+++ protos.h +++ protos.h
@@ -93,6 +93,7 @@ ADDRESS *mutt_get_address (ENVELOPE *, c @@ -93,6 +93,7 @@ ADDRESS *mutt_get_address (ENVELOPE *, c
ADDRESS *mutt_lookup_alias (const char *s); ADDRESS *mutt_lookup_alias (const char *s);
ADDRESS *mutt_remove_duplicates (ADDRESS *); ADDRESS *mutt_remove_duplicates (ADDRESS *);
ADDRESS *mutt_remove_xrefs (ADDRESS *, ADDRESS *); ADDRESS *mutt_remove_xrefs (ADDRESS *, ADDRESS *);
+ADDRESS *mutt_reverse_address (ADDRESS *); +ADDRESS *mutt_reverse_address (ADDRESS *);
ADDRESS *mutt_expand_aliases (ADDRESS *); ADDRESS *mutt_expand_aliases (ADDRESS *);
ADDRESS *mutt_parse_adrlist (ADDRESS *, const char *); ADDRESS *mutt_parse_adrlist (ADDRESS *, const char *);
--- send.c.orig 2017-05-30 19:27:53 UTC --- send.c.orig 2017-09-04 23:35:27 UTC
+++ send.c +++ send.c
@@ -585,6 +585,10 @@ void mutt_fix_reply_recipients (ENVELOPE @@ -598,6 +598,10 @@ void mutt_fix_reply_recipients (ENVELOPE
/* the CC field can get cluttered, especially with lists */ /* the CC field can get cluttered, especially with lists */
env->to = mutt_remove_duplicates (env->to); env->to = mutt_remove_duplicates (env->to);
env->cc = mutt_remove_duplicates (env->cc); env->cc = mutt_remove_duplicates (env->cc);
+ if (option (OPTREVREPLY)){ + if (option (OPTREVREPLY)){
+ env->to = mutt_reverse_address (env->to); + env->to = mutt_reverse_address (env->to);
+ env->cc = mutt_reverse_address (env->cc); + env->cc = mutt_reverse_address (env->cc);
+ } + }
env->cc = mutt_remove_xrefs (env->to, env->cc); env->cc = mutt_remove_xrefs (env->to, env->cc);
if (env->cc && !env->to) if (env->cc && !env->to)
--- sendlib.c.orig 2017-05-30 19:27:53 UTC --- sendlib.c.orig 2017-09-04 23:35:27 UTC
+++ sendlib.c +++ sendlib.c
@@ -2714,6 +2714,35 @@ static void set_noconv_flags (BODY *b, s @@ -2753,6 +2753,35 @@ static void set_noconv_flags (BODY *b, s
} }
} }
+/* given a list of addresses, return a list of reverse_alias'ed addresses */ +/* given a list of addresses, return a list of reverse_alias'ed addresses */
+ADDRESS *mutt_reverse_address (ADDRESS *addr) +ADDRESS *mutt_reverse_address (ADDRESS *addr)
+{ +{
+ ADDRESS *top,*tmp,*alias; + ADDRESS *top,*tmp,*alias;
+ +
Show All 27 Lines