X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/1691e80890e5d8ba258c51c214a3e91880e1db2b..303e8387acecca26329e939f228f78ca805b7a15:/etc/replcomps?ds=inline

diff --git a/etc/replcomps b/etc/replcomps
index 52170a76..cf361095 100644
--- a/etc/replcomps
+++ b/etc/replcomps
@@ -1,21 +1,43 @@
-%; replcomps
-%;
-%; default form (components) file for `repl'
-%;
-%; Check for the following headers (in this order)
-%; to construct the return address
-%;
-%; Mail-Reply-To
-%; Reply-To
-%; From
-%; Sender
-%; Return-Path
-%;
-%(lit)%(formataddr %<{mail-reply-to}%?{reply-to}%?{from}%?{sender}%?{return-path}%>)\
-%<(nonnull)%(void(width))%(putaddr To: )\n%>\
-%<{fcc}Fcc: %{fcc}\n%>\
-%<{subject}Subject: Re: %{subject}\n%>\
-%<{date}In-Reply-To: Your message of "\
-%<(nodate{date})%{date}%|%(pretty{date})%>."%<{message-id}
-             %{message-id}%>\n%>\
+%;
+%; replcomps - our default component file for "repl"
+%;
+%;
+%; First, output a "From" header.
+%(void(localmbox))%(void(width))%(putaddr From: )
+%;
+%; These next lines slurp in lots of addresses for To: and cc:.
+%; Use with repl -query or else you may get flooded with addresses!
+%; Currently %(decode) should NOT be used on address fields, in case invalid
+%; characters are in an address.
+%;
+%; If no To:/cc:/Fcc: text, we output empty fields for prompter to fill in.
+%;
+%(lit)%(formataddr{reply-to})\
+%(formataddr %<{from}%(void{from})%|%(void{apparently-from})%>)\
+%(formataddr{resent-to})\
+%(formataddr{prev-resent-to})\
+%(formataddr{x-to})\
+%(formataddr{apparently-to})\
+%(void(width))%(putaddr To: )
+%(lit)%(formataddr{to})\
+%(formataddr{cc})\
+%(formataddr{x-cc})\
+%(formataddr{resent-cc})\
+%(formataddr{prev-resent-cc})\
+%(formataddr(localmbox))\
+%(void(width))%(putaddr cc: )
+Fcc: %<{fcc}%{fcc}%|+outbox%>
+Subject: %<{subject}Re: %(void{subject})%(trim)%(putstr)%>
+%;
+%; Make References: and In-reply-to: fields for threading.
+%; Use (void), (trim) and (putstr) to eat trailing whitespace.
+%;
+%<{message-id}In-reply-to: %{message-id}\n%>\
+%<{message-id}References: \
+%<{references}%(void{references})%(trim)%(putstr) %>\
+%(void{message-id})%(trim)%(putstr)\n%>\
+Comments: In-reply-to \
+%<{from}%(void{from})%?(void{apparently-from})%|%(void{sender})%>\
+%(trim)%(putstr)\n\
+   message dated "%<(nodate{date})%{date}%|%(tws{date})%>."
 --------