summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2017-06-27 23:33:16 +0300
committerSergey Poznyakoff <gray@gnu.org.ua>2017-06-27 23:33:16 +0300
commitce6bc0bd0405805e8567850fa7526f7839d37aeb (patch)
tree68d244ccffae0e8c6303619acb2fbc0db0775700
parent1b2975985fcd448d882c0be81db03597ba97478e (diff)
downloadmailutils-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/replcomps7
-rw-r--r--mh/etc/replgroupcomps7
-rw-r--r--mh/repl.c21
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 @@
10%(lit)%<(rcpt to)%(formataddr{to})%>%<(rcpt cc)%(formataddr{cc})%>%<(rcpt me)%(formataddr(me))%>\ 10%(lit)%<(rcpt to)%(formataddr{to})%>%<(rcpt cc)%(formataddr{cc})%>%<(rcpt me)%(formataddr(me))%>\
11%<(nonnull)%(void(width))%(putaddr cc: )\n%>\ 11%<(nonnull)%(void(width))%(putaddr cc: )\n%>\
12%<(mymbox{from})%<{fcc}Fcc: %{fcc}\n%>%>\ 12%<(mymbox{from})%<{fcc}Fcc: %{fcc}\n%>%>\
13%<{subject}%(lit)%<(isreply)%?(profile reply-prefix)%(concat)%|%(concat Re:)%>%(concat{subject})%(printhdr Subject: )\n%>\ 13Subject: %<{subject}%(putstr %<(profile reply-prefix)%|\
14%(lit)%(concat(in_reply_to))%<(nonnull)%(void(width))%(printhdr In-reply-to: )\n%>\ 14%(void Re:)%>) %(void(unre{subject}))%(trim)%(putstr)%>
15%(lit)%(concat(references))%<(nonnull)%(void(width))%(printhdr References: )\n%>\ 15%(lit)%<(in_reply_to)%(void(width))%(printhdr In-reply-to: )\n%>\
16%(lit)%<(references)%(void(width))%(printhdr References: )\n%>\
16-------- 17--------
17 18
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 @@
14%<(nonnull)%(void(width))%(putaddr cc: )\n%>%>\ 14%<(nonnull)%(void(width))%(putaddr cc: )\n%>%>\
15%; 15%;
16%<(mymbox{from})%<{fcc}Fcc: %{fcc}\n%>%>\ 16%<(mymbox{from})%<{fcc}Fcc: %{fcc}\n%>%>\
17%<{subject}%(lit)%<(isreply{subject})%?(profile reply-prefix)%(concat)%|%(concat Re:)%>%(concat{subject})%(printhdr Subject: )\n%>\ 17Subject: %<{subject}%(putstr %<(profile reply-prefix)%|\
18%(lit)%(concat(in_reply_to))%<(nonnull)%(void(width))%(printhdr In-reply-to: )\n%>\ 18%(void Re:)%>) %(void(unre{subject}))%(trim)%(putstr)%>
19%(lit)%(concat(references))%<(nonnull)%(void(width))%(printhdr References: )\n%>\ 19%(lit)%<(in_reply_to)%(void(width))%(printhdr In-reply-to: )\n%>\
20%(lit)%<(references)%(void(width))%(printhdr References: )\n%>\
20-------- 21--------
21 22
diff --git a/mh/repl.c b/mh/repl.c
index e1dca9681..277d6df81 100644
--- a/mh/repl.c
+++ b/mh/repl.c
@@ -173,16 +173,17 @@ static struct mu_option options[] = {
173}; 173};
174 174
175static char default_format_str[] = 175static char default_format_str[] =
176"%(lit)%(formataddr %<{reply-to}%?{from}%?{sender}%?{return-path}%>)" 176 "%(lit)%(formataddr %<{reply-to}%?{from}%?{sender}%?{return-path}%>)"
177"%<(nonnull)%(void(width))%(putaddr To: )\\n%>" 177 "%<(nonnull)%(void(width))%(putaddr To: )\\n%>"
178"%(lit)%<(rcpt to)%(formataddr{to})%>%<(rcpt cc)%(formataddr{cc})%>%<(rcpt me)%(formataddr(me))%>" 178 "%(lit)%<(rcpt to)%(formataddr{to})%>%<(rcpt cc)%(formataddr{cc})%>%<(rcpt me)%(formataddr(me))%>"
179"%<(nonnull)%(void(width))%(putaddr cc: )\\n%>" 179 "%<(nonnull)%(void(width))%(putaddr cc: )\\n%>"
180"%<{fcc}Fcc: %{fcc}\\n%>" 180 "%<(mymbox{from})%<{fcc}Fcc: %{fcc}\\n%>%>"
181"%<{subject}Subject: Re: %(unre{subject})\\n%>" 181 "Subject: %<{subject}%(putstr %<(profile reply-prefix)%|"
182"%(lit)%(concat(in_reply_to))%<(nonnull)%(void(width))%(printhdr In-reply-to: )\\n%>" 182 "%(void Re:)%>) %(void(unre{subject}))%(trim)%(putstr)%>\n"
183"%(lit)%(concat(references))%<(nonnull)%(void(width))%(printhdr References: )\\n%>" 183 "%(lit)%<(in_reply_to)%(void(width))%(printhdr In-reply-to: )\\n%>"
184"X-Mailer: MH \\(%(package_string)\\)\\n" 184 "%(lit)%<(references)%(void(width))%(printhdr References: )\\n%>"
185"--------\n"; 185 "X-Mailer: MH (%(package_string))\n"
186 "--------\n";
186 187
187void 188void
188make_draft (mu_mailbox_t mbox, int disp, struct mh_whatnow_env *wh) 189make_draft (mu_mailbox_t mbox, int disp, struct mh_whatnow_env *wh)

Return to:

Send suggestions and report system problems to the System administrator.