* Changed repl defaults to partly revert to MH behaviour:

	  "-cc all" is now only implied with -group.
	* The replcomps template includes cc: header again (as in MH).
	* Updated repl man page to reflect these changes.

diff --git a/ChangeLog b/ChangeLog
index 693d7c8..5411977 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Sun Oct 17 08:28:56 1999 Ruud de Rooij <ruud@ruud.org>
+
+       * Changed repl defaults to partly revert to MH behaviour,
+         "-cc all" is now only implied with -group.
+
+       * The replcomps template includes cc: header again (as in MH).
+
+       * Updated repl man page to reflect these changes.
+

 Sat Oct 16 02:57:47 1999 Doug Morris <doug@mhost.com>
 
        * Tweaked configure to handle Solaris and SunOS after the BIND
 Sat Oct 16 02:57:47 1999 Doug Morris <doug@mhost.com>
 
        * Tweaked configure to handle Solaris and SunOS after the BIND

diff --git a/etc/replcomps b/etc/replcomps
index 52170a7..0445181 100644 (file)
--- a/etc/replcomps
+++ b/etc/replcomps
@@ -11,8 +11,16 @@
 %; Sender
 %; Return-Path
 %;
 %; 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 %<{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 "\
 %<{fcc}Fcc: %{fcc}\n%>\
 %<{subject}Subject: Re: %{subject}\n%>\
 %<{date}In-Reply-To: Your message of "\

diff --git a/man/repl.man b/man/repl.man
index a7e1165..f767db7 100644 (file)
--- a/man/repl.man
+++ b/man/repl.man
@@ -65,6 +65,7 @@ to construct the reply message draft as follows:
 .nf
 .in 1i
 To: <Mail\-Reply\-To> or <Reply\-To> or <From>
 .nf
 .in 1i
 To: <Mail\-Reply\-To> or <Reply\-To> or <From>

+cc: <To> and <cc> and <personal address>

 Subject: Re: <Subject>
 In\-Reply\-To: Your message of <Date>.
 .ti +\w'In\-Reply\-To: 'u
 Subject: Re: <Subject>
 In\-Reply\-To: Your message of <Date>.
 .ti +\w'In\-Reply\-To: 'u

@@ -76,6 +77,12 @@ where field names enclosed in angle brackets (<\ >) indicate the
 contents of the named field from the message to which the reply is
 being made.
 
 contents of the named field from the message to which the reply is
 being made.
 

+By default, the \*(lqcc:\*(rq field is empty.  You may selectively add
+addresses to this default with the `\-cc\ type' switch.  This switch takes an
+argument (all/to/cc/me) which specifies who gets added to the default
+\*(lqcc:\*(rq list of the reply.  You may give this switch multiple times (with
+different arguments) if you wish to add multiple types of addresses.
+

 If the switch `\-group' is given, then \fIrepl\fR will use the the
 standard forms file \*(lqreplgroupcomps\*(rq.  This will construct a
 draft message that is intended as a group or followup reply.  If a file
 If the switch `\-group' is given, then \fIrepl\fR will use the the
 standard forms file \*(lqreplgroupcomps\*(rq.  This will construct a
 draft message that is intended as a group or followup reply.  If a file

@@ -108,15 +115,16 @@ In\-Reply\-To: Message from <From> of <Date>.
 .in .5i
 .fi
 
 .in .5i
 .fi
 

+By default, the \*(lqcc:\*(rq contains all the addresses shown.  You may
+selectively remove addresses from this default with the `\-nocc\ type' switch.
+This switch takes an argument (all/to/cc/me) which specifies who gets removed
+from the default \*(lqcc:\*(rq list of the reply.  You may give this switch
+multiple times (with different arguments) if you wish to remove multiple types
+of addresses.
+

 In any case, you may specify an alternate forms file with the switch
 `\-form\ formfile'.
 
 In any case, you may specify an alternate forms file with the switch
 `\-form\ formfile'.
 

-You may selectively remove addresses from this default with the
-`\-nocc\ type' switch.  This switch takes an argument (all/to/cc/me)
-which specifies who gets removed from the default \*(lqcc:\*(rq list of
-the reply.  You may give this switch multiple times (with different
-arguments) if you wish to remove multiple types of addresses.
-

 The `\-query' switch modifies the action of `\-nocc\ type' switch by
 interactively asking you if each address that normally would be placed in
 the \*(lqTo:\*(rq and \*(lqcc:\*(rq list should actually be sent a copy.
 The `\-query' switch modifies the action of `\-nocc\ type' switch by
 interactively asking you if each address that normally would be placed in
 the \*(lqTo:\*(rq and \*(lqcc:\*(rq list should actually be sent a copy.

@@ -299,7 +307,7 @@ mhbuild(1), comp(1), forw(1), send(1), whatnow(1), mh\-format(5)
 .Ds
 `\-nogroup'
 .Ds
 .Ds
 `\-nogroup'
 .Ds

-`\-cc\ all'
+`\-nocc\ all' with `\-nogroup', `\-cc\ all' with `\-group'

 .Ds
 `\-noannotate'
 .Ds
 .Ds
 `\-noannotate'
 .Ds

diff --git a/uip/repl.c b/uip/repl.c
index 67155fa..d7c09ac 100644 (file)
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -108,9 +108,9 @@ static struct swit aqrl[] = {
     { NULL, 0 }
 };
 
     { NULL, 0 }
 };
 

-short ccto = 1;                /* global for replsbr */
-short cccc = 1;
-short ccme = 1;
+short ccto = 0;                /* global for replsbr */
+short cccc = 0;
+short ccme = 0;

 short querysw = 0;
 
 short outputlinelen = OUTPUTLINELEN;
 short querysw = 0;
 
 short outputlinelen = OUTPUTLINELEN;

@@ -177,9 +177,11 @@ main (int argc, char **argv)
 
                case GROUPSW:
                    groupreply++;
 
                case GROUPSW:
                    groupreply++;

+                   ccto = cccc = ccme = 1;

                    continue;
                case NGROUPSW:
                    groupreply = 0;
                    continue;
                case NGROUPSW:
                    groupreply = 0;

+                   ccto = cccc = ccme = 0;

                    continue;
 
                case ANNOSW: 
                    continue;
 
                case ANNOSW: