diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2017-06-27 23:33:16 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2017-06-27 23:33:16 +0300 |
commit | ce6bc0bd0405805e8567850fa7526f7839d37aeb (patch) | |
tree | 68d244ccffae0e8c6303619acb2fbc0db0775700 | |
parent | 1b2975985fcd448d882c0be81db03597ba97478e (diff) | |
download | mailutils-ce6bc0bd0405805e8567850fa7526f7839d37aeb.tar.gz mailutils-ce6bc0bd0405805e8567850fa7526f7839d37aeb.tar.bz2 |
MH: Fix repl formats
* mh/etc/replcomps: Replace calls to %(concat)
* mh/etc/replgroupcomps: Likewise.
* mh/repl.c: Fix embedded format.
-rw-r--r-- | mh/etc/replcomps | 7 | ||||
-rw-r--r-- | mh/etc/replgroupcomps | 7 | ||||
-rw-r--r-- | mh/repl.c | 21 |
3 files changed, 19 insertions, 16 deletions
diff --git a/mh/etc/replcomps b/mh/etc/replcomps index 17241e96f..63fddf9eb 100644 --- a/mh/etc/replcomps +++ b/mh/etc/replcomps @@ -10,8 +10,9 @@ %(lit)%<(rcpt to)%(formataddr{to})%>%<(rcpt cc)%(formataddr{cc})%>%<(rcpt me)%(formataddr(me))%>\ %<(nonnull)%(void(width))%(putaddr cc: )\n%>\ %<(mymbox{from})%<{fcc}Fcc: %{fcc}\n%>%>\ -%<{subject}%(lit)%<(isreply)%?(profile reply-prefix)%(concat)%|%(concat Re:)%>%(concat{subject})%(printhdr Subject: )\n%>\ -%(lit)%(concat(in_reply_to))%<(nonnull)%(void(width))%(printhdr In-reply-to: )\n%>\ -%(lit)%(concat(references))%<(nonnull)%(void(width))%(printhdr References: )\n%>\ +Subject: %<{subject}%(putstr %<(profile reply-prefix)%|\ +%(void Re:)%>) %(void(unre{subject}))%(trim)%(putstr)%> +%(lit)%<(in_reply_to)%(void(width))%(printhdr In-reply-to: )\n%>\ +%(lit)%<(references)%(void(width))%(printhdr References: )\n%>\ -------- diff --git a/mh/etc/replgroupcomps b/mh/etc/replgroupcomps index bbd51826a..e9aa305d3 100644 --- a/mh/etc/replgroupcomps +++ b/mh/etc/replgroupcomps @@ -14,8 +14,9 @@ %<(nonnull)%(void(width))%(putaddr cc: )\n%>%>\ %; %<(mymbox{from})%<{fcc}Fcc: %{fcc}\n%>%>\ -%<{subject}%(lit)%<(isreply{subject})%?(profile reply-prefix)%(concat)%|%(concat Re:)%>%(concat{subject})%(printhdr Subject: )\n%>\ -%(lit)%(concat(in_reply_to))%<(nonnull)%(void(width))%(printhdr In-reply-to: )\n%>\ -%(lit)%(concat(references))%<(nonnull)%(void(width))%(printhdr References: )\n%>\ +Subject: %<{subject}%(putstr %<(profile reply-prefix)%|\ +%(void Re:)%>) %(void(unre{subject}))%(trim)%(putstr)%> +%(lit)%<(in_reply_to)%(void(width))%(printhdr In-reply-to: )\n%>\ +%(lit)%<(references)%(void(width))%(printhdr References: )\n%>\ -------- @@ -173,16 +173,17 @@ static struct mu_option options[] = { }; static char default_format_str[] = -"%(lit)%(formataddr %<{reply-to}%?{from}%?{sender}%?{return-path}%>)" -"%<(nonnull)%(void(width))%(putaddr To: )\\n%>" -"%(lit)%<(rcpt to)%(formataddr{to})%>%<(rcpt cc)%(formataddr{cc})%>%<(rcpt me)%(formataddr(me))%>" -"%<(nonnull)%(void(width))%(putaddr cc: )\\n%>" -"%<{fcc}Fcc: %{fcc}\\n%>" -"%<{subject}Subject: Re: %(unre{subject})\\n%>" -"%(lit)%(concat(in_reply_to))%<(nonnull)%(void(width))%(printhdr In-reply-to: )\\n%>" -"%(lit)%(concat(references))%<(nonnull)%(void(width))%(printhdr References: )\\n%>" -"X-Mailer: MH \\(%(package_string)\\)\\n" -"--------\n"; + "%(lit)%(formataddr %<{reply-to}%?{from}%?{sender}%?{return-path}%>)" + "%<(nonnull)%(void(width))%(putaddr To: )\\n%>" + "%(lit)%<(rcpt to)%(formataddr{to})%>%<(rcpt cc)%(formataddr{cc})%>%<(rcpt me)%(formataddr(me))%>" + "%<(nonnull)%(void(width))%(putaddr cc: )\\n%>" + "%<(mymbox{from})%<{fcc}Fcc: %{fcc}\\n%>%>" + "Subject: %<{subject}%(putstr %<(profile reply-prefix)%|" + "%(void Re:)%>) %(void(unre{subject}))%(trim)%(putstr)%>\n" + "%(lit)%<(in_reply_to)%(void(width))%(printhdr In-reply-to: )\\n%>" + "%(lit)%<(references)%(void(width))%(printhdr References: )\\n%>" + "X-Mailer: MH (%(package_string))\n" + "--------\n"; void make_draft (mu_mailbox_t mbox, int disp, struct mh_whatnow_env *wh) |