From 9e27fef315a1e9df848c357cc4c96b1c000bfcd7 Mon Sep 17 00:00:00 2001
From: Ken Hornstein <kenh@pobox.com>
Date: Mon, 20 Feb 2012 00:31:14 -0500
Subject: [PATCH] Put default From: headers in these component files, and
 document the components file now that we can have comments.

---
 etc/components     |   19 +++++++++++++++++++
 etc/replcomps      |    7 ++++++-
 etc/replgroupcomps |    1 +
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/etc/components b/etc/components
index 26d54c2..64a0337 100644
--- a/etc/components
+++ b/etc/components
@@ -1,6 +1,25 @@
+%;
+%; Our default components file.  Used by `comp'
+%;
+%;
+%; This line creates our From: header based on the following ordering:
+%;
+%; - Use a -from switch if it exists ({from})
+%; - Use our local mailbox identity; first from the Local-Mailbox profile
+%;   entry, otherwise gets the information from the local system
+%;
 %<{from}%|%(void(localmbox))%>%(void(width))%(putaddr From: )
+%;
+%; Here we include an address list if one or more "-to" arguments were
+%; given, otherwise just output a blank header.  We do the same for the
+%; "cc" header as well.
+%;
 %<{to}%(void(width))%(putaddr To: )%|To:%>
 %<{cc}%(void(width))%(putaddr cc: )%|cc:%>
+%;
+%; Slight difference here: if we're not given "-fcc" on the command line,
+%; make the default mailbox +outbox
+%;
 Fcc: %<{fcc}%(putstr)%|+outbox%>
 Subject:
 --------
diff --git a/etc/replcomps b/etc/replcomps
index 9166411..204f117 100644
--- a/etc/replcomps
+++ b/etc/replcomps
@@ -1,4 +1,9 @@
-%; $Header$
+%;
+%; 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!
diff --git a/etc/replgroupcomps b/etc/replgroupcomps
index 210a3e0..7b48e18 100644
--- a/etc/replgroupcomps
+++ b/etc/replgroupcomps
@@ -20,6 +20,7 @@
 %;     cc              (and)
 %;     personal address
 %;
+%(void(localmbox))%(void(width))%(putaddr From: )
 %(lit)%(formataddr{mail-followup-to})\
 %<(nonnull)%(void(width))%(putaddr To: )\n\
 %|\
-- 
1.7.10.4