Default templates for 'comp', 'forw', 'dist', 'repl' now include

Fcc: +outbox

diff --git a/etc/components b/etc/components
index 2669f04..7f255ea 100644 (file)
--- a/etc/components
+++ b/etc/components
@@ -1,4 +1,5 @@
 To:
 cc:
 To:
 cc:

+Fcc: +outbox

 Subject:
 --------
 Subject:
 --------

diff --git a/etc/distcomps b/etc/distcomps
index c6dc39a..d30819a 100644 (file)
--- a/etc/distcomps
+++ b/etc/distcomps
@@ -1,2 +1,3 @@
 Resent-To:
 Resent-cc:
 Resent-To:
 Resent-cc:

+Resent-fcc:

diff --git a/etc/forwcomps b/etc/forwcomps
index 2669f04..7f255ea 100644 (file)
--- a/etc/forwcomps
+++ b/etc/forwcomps
@@ -1,4 +1,5 @@
 To:
 cc:
 To:
 cc:

+Fcc: +outbox

 Subject:
 --------
 Subject:
 --------

diff --git a/etc/replcomps b/etc/replcomps
index 21282fc..6ec3ce7 100644 (file)
--- a/etc/replcomps
+++ b/etc/replcomps
@@ -1,28 +1,26 @@
-%; $Id$
-%;
-%; 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
-%;
-%; AND
-%;
-%; cc: To              (and)
-%;     cc              (and)
-%;     personal address
-%;
-%(lit)%(formataddr %<{mail-reply-to}%?{reply-to}%?{from}%?{sender}%?{return-path}%>)\
-%<(nonnull)%(void(width))%(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%>\
+%; $Header$
+%;
+%; These next lines slurp in lots of addresses for To: and cc:.
+%; Use with repl -query or else you may get flooded with addresses!
+%;
+%; 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(me))\
+%(void(width))%(putaddr cc: )
+Fcc: %<{fcc}%{fcc}%|+outbox%>
+Subject: %<{subject}Re: %{subject}%>

 %;
 %; Make References: and In-reply-to: fields for threading.
 %; Use (void), (trim) and (putstr) to eat trailing whitespace.
 %;
 %; Make References: and In-reply-to: fields for threading.
 %; Use (void), (trim) and (putstr) to eat trailing whitespace.

diff --git a/etc/replgroupcomps b/etc/replgroupcomps
index 4a3e3a4..7920544 100644 (file)
--- a/etc/replgroupcomps
+++ b/etc/replgroupcomps
@@ -1,6 +1,6 @@
-%; $Id$
+%; replgroupcomps

 %;
 %;

-%; replgroupcomps:  form (components) file for `repl -group'
+%; form (components) file for `repl -group'

 %;
 %; Check the following headers to create reply addresses.
 %;
 %;
 %; Check the following headers to create reply addresses.
 %;

@@ -28,8 +28,8 @@
 %(lit)%(formataddr{to})%(formataddr{cc})%(formataddr(me))\
 %<(nonnull)%(void(width))%(putaddr cc: )\n%>%>\
 %;
 %(lit)%(formataddr{to})%(formataddr{cc})%(formataddr(me))\
 %<(nonnull)%(void(width))%(putaddr cc: )\n%>%>\
 %;

-%<{fcc}Fcc: %{fcc}\n%>\
-%<{subject}Subject: Re: %{subject}\n%>\
+Fcc: %<{fcc}%{fcc}%|+outbox%>
+Subject: %<{subject}Re: %{subject}%>

 %;
 %; Make References: and In-reply-to: fields for threading.
 %; Use (void), (trim) and (putstr) to eat trailing whitespace.
 %;
 %; Make References: and In-reply-to: fields for threading.
 %; Use (void), (trim) and (putstr) to eat trailing whitespace.