[Nmh-commits] nmh/etc components, 1.1.1.1, 1.1.1.1.6.1 distcomps, 1.1.1.1, 1.1.1.1.6.1 forwcomps, 1.1.1.1, 1.1.1.1.6.1 replcomps, 1.3, 1.3.2.1 replgroupcomps, 1.2, 1.2.2.1

[Ken Hornstein <address@hidden>]

Update of /cvsroot/nmh/nmh/etc
In directory subversions:/tmp/cvs-serv30347/etc

Modified Files:
      Tag: RELEASE_1_1
        components distcomps forwcomps replcomps replgroupcomps 
Log Message:
Merge in changes that didn't make it onto the release branch.


Index: distcomps
===================================================================
RCS file: /cvsroot/nmh/nmh/etc/distcomps,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.6.1
diff -C2 -d -r1.1.1.1 -r1.1.1.1.6.1
*** distcomps   30 Apr 1999 18:08:35 -0000      1.1.1.1
--- distcomps   24 Oct 2003 20:14:46 -0000      1.1.1.1.6.1
***************
*** 1,2 ****
--- 1,3 ----
  Resent-To:
  Resent-cc:
+ Resent-fcc:

Index: replgroupcomps
===================================================================
RCS file: /cvsroot/nmh/nmh/etc/replgroupcomps,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** replgroupcomps      28 May 2000 14:42:01 -0000      1.2
--- replgroupcomps      24 Oct 2003 20:14:46 -0000      1.2.2.1
***************
*** 29,37 ****
  %<(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\
! %<{message-id}References: %<{references} %{references}%> %{message-id}\n%>\
  --------
--- 29,45 ----
  %<(nonnull)%(void(width))%(putaddr cc: )\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.
! %;
! %<{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})%>."
  --------

Index: forwcomps
===================================================================
RCS file: /cvsroot/nmh/nmh/etc/forwcomps,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.6.1
diff -C2 -d -r1.1.1.1 -r1.1.1.1.6.1
*** forwcomps   30 Apr 1999 18:08:35 -0000      1.1.1.1
--- forwcomps   24 Oct 2003 20:14:46 -0000      1.1.1.1.6.1
***************
*** 1,4 ****
--- 1,5 ----
  To:
  cc:
+ Fcc: +outbox
  Subject:
  --------

Index: components
===================================================================
RCS file: /cvsroot/nmh/nmh/etc/components,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.6.1
diff -C2 -d -r1.1.1.1 -r1.1.1.1.6.1
*** components  30 Apr 1999 18:08:35 -0000      1.1.1.1
--- components  24 Oct 2003 20:14:46 -0000      1.1.1.1.6.1
***************
*** 1,4 ****
--- 1,5 ----
  To:
  cc:
+ Fcc: +outbox
  Subject:
  --------

Index: replcomps
===================================================================
RCS file: /cvsroot/nmh/nmh/etc/replcomps,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** replcomps   28 May 2000 14:42:01 -0000      1.3
--- replcomps   24 Oct 2003 20:14:46 -0000      1.3.2.1
***************
*** 1,30 ****
! %; 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%>\
! %<{date}In-Reply-To: Your message of "\
! %<(nodate{date})%{date}%|%(pretty{date})%>."%<{message-id}
!              %{message-id}%>\n%>\
! %<{message-id}References: %<{references} %{references}%> %{message-id}\n%>\
  --------
--- 1,36 ----
! %; $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.
  %;
! %<{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})%>."
  --------