Fix missing va_end call in uip/mhmisc.c

[mmh] / etc / replgroupcomps

diff --git a/etc/replgroupcomps b/etc/replgroupcomps
index 9295fd0..09d6360 100644 (file)
--- a/etc/replgroupcomps
+++ b/etc/replgroupcomps
@@ -16,21 +16,33 @@
 %;
 %; AND
 %;
-%; cc: To              (and)
-%;     cc              (and)
+%; Cc: To              (and)
+%;     Cc              (and)
 %;     personal address
 %;
 %(lit)%(formataddr{mail-followup-to})\
-%<(nonnull)%(void(width))%(putaddr To: )\n\
+%<(nonnull)%(void(width))%(void(decode))%(putaddr To: )\n\
 %|\
 %(lit)%(formataddr %<{mail-reply-to}%?{reply-to}%?{from}%?{sender}%?{return-path}%>)\
-%<(nonnull)%(void(width))%(putaddr To: )\n%>\
+%<(nonnull)%(void(width))%(void(decode))%(putaddr To: )\n%>\
 %(lit)%(formataddr{to})%(formataddr{cc})%(formataddr(me))\
-%<(nonnull)%(void(width))%(putaddr cc: )\n%>%>\
-%;
-%<{fcc}Fcc: %{fcc}\n%>\
-%<{subject}Subject: Re: %{subject}\n%>\
-In-Reply-To: Message from %<{from}%{from}%?{sender}%{sender}%|%{return-path}%>\n\
-   of "%<(nodate{date})%{date}%|%(pretty{date})%>."\
-%<{message-id} %{message-id}%>\n\
+%<(nonnull)%(void(width))%(void(decode))%(putaddr Cc: )\n%>%>\
+%;
+Fcc: +sent
+Subject: %<{subject}Re: %(putstr(trim(decode{subject})))%>
+%;
+%; Make References: and In-reply-to: fields for threading.
+%; Use (trim) to eat trailing whitespace.
+%;
+%<{message-id}In-reply-to: %{message-id}\n%>\
+%<{message-id}References: \
+%<{references}%(trim{references})%(putstr) %>\
+%(trim{message-id})%(putstr)\n%>\
+Comments: In-reply-to \
+%<{from}%(void{from})%?(void{apparently-from})%|%(void{sender})%>\
+%(putstr(trim(decode)))\n\
+   message dated "%<(nodate{date})%{date}%|%(tws{date})%>."
 --------
+[%4(year{date})-%02(mon{date})-%02(mday{date}) \
+%02(hour{date}):%02(min{date})] %(decode{from})
+>