===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mail/collect.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** src/usr.bin/mail/collect.c	1997/04/13 20:22:39	1.4
--- src/usr.bin/mail/collect.c	1997/04/13 20:32:06	1.5
***************
*** 1,4 ****
! /*	$OpenBSD: collect.c,v 1.4 1997/04/13 20:22:39 deraadt Exp $	*/
  /*	$NetBSD: collect.c,v 1.6 1996/06/08 19:48:16 christos Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: collect.c,v 1.5 1997/04/13 20:32:06 deraadt Exp $	*/
  /*	$NetBSD: collect.c,v 1.6 1996/06/08 19:48:16 christos Exp $	*/
  
  /*
***************
*** 38,44 ****
  #if 0
  static char sccsid[] = "@(#)collect.c	8.2 (Berkeley) 4/19/94";
  #else
! static char rcsid[] = "$OpenBSD: collect.c,v 1.4 1997/04/13 20:22:39 deraadt Exp $";
  #endif
  #endif /* not lint */
  
--- 38,44 ----
  #if 0
  static char sccsid[] = "@(#)collect.c	8.2 (Berkeley) 4/19/94";
  #else
! static char rcsid[] = "$OpenBSD: collect.c,v 1.5 1997/04/13 20:32:06 deraadt Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 154,160 ****
  		if (hadintr) {
  			fflush(stdout);
  			fprintf(stderr,
! 			"\n(Interrupt -- one more to kill letter)\n");
  		} else {
  			if (isatty(0)) {
  				printf("(continue)\n");
--- 154,160 ----
  		if (hadintr) {
  			fflush(stdout);
  			fprintf(stderr,
! 			    "\n(Interrupt -- one more to kill letter)\n");
  		} else {
  			if (isatty(0)) {
  				printf("(continue)\n");
***************
*** 601,607 ****
  	/*
  	 * the control flow is subtle, because we can be called from ~q.
  	 */
! 	if (!hadintr) {
  		if (value("ignore") != NOSTR) {
  			puts("@");
  			fflush(stdout);
--- 601,607 ----
  	/*
  	 * the control flow is subtle, because we can be called from ~q.
  	 */
! 	if (hadintr == 0 && isatty(0)) {
  		if (value("ignore") != NOSTR) {
  			puts("@");
  			fflush(stdout);