Merge branch 'master' of git.sv.gnu.org:/srv/git/nmh

[nmh] / etc / components

diff --git a/etc/components b/etc/components
index 95be90cf19ebe199fa599bf28e654f08e420dd7d..17cdc6c731fc0020c3c39d9e37d03f73bff512fc 100644 (file)
--- a/etc/components
+++ b/etc/components
@@ -1,6 +1,24 @@
-From: %(localmbox)
-To:
-cc:
-Fcc: +outbox
-Subject:
+%; 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:%<{subject} %(putstr)%>

 --------
 --------