===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/talk/display.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- src/usr.bin/talk/display.c	1998/04/28 22:13:22	1.5
+++ src/usr.bin/talk/display.c	1999/03/23 17:00:38	1.6
@@ -1,4 +1,4 @@
-/*	$OpenBSD: display.c,v 1.5 1998/04/28 22:13:22 pjanzen Exp $	*/
+/*	$OpenBSD: display.c,v 1.6 1999/03/23 17:00:38 millert Exp $	*/
 /*	$NetBSD: display.c,v 1.3 1994/12/09 02:14:13 jtc Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)display.c	8.1 (Berkeley) 6/6/93";
 #endif
-static char rcsid[] = "$OpenBSD: display.c,v 1.5 1998/04/28 22:13:22 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: display.c,v 1.6 1999/03/23 17:00:38 millert Exp $";
 #endif /* not lint */
 
 /*
@@ -80,7 +80,13 @@
 	char cch;
 
 	for (i = 0; i < size; i++) {
-		if (*text == '\n' || *text == '\r') {
+		/*
+		 * Since we do not use curses's input routines we must
+		 * convert '\r' -> '\n' ourselves.
+		 */
+		if (*text == '\r')
+			*text = '\n';
+		if (*text == '\n') {
 			xscroll(win, 0);
 			text++;
 			continue;