summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorThorsten Lockert <tholo@cvs.openbsd.org>1996-12-17 19:19:34 +0000
committerThorsten Lockert <tholo@cvs.openbsd.org>1996-12-17 19:19:34 +0000
commit04c9aff5680eafa3b2249b01b56a24169e56715a (patch)
tree274d6a42e30135494725d160ae0d5daa300586a5 /sys
parent0fc5ad2891dcde17a67b3cfd32af9e90df07245f (diff)
Fix oversight in column handling with OCRNL enabled
Diffstat (limited to 'sys')
-rw-r--r--sys/kern/tty.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index 7d089df71a2..4b5cfbd734a 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty.c,v 1.22 1996/12/17 19:15:24 tholo Exp $ */
+/* $OpenBSD: tty.c,v 1.23 1996/12/17 19:19:33 tholo Exp $ */
/* $NetBSD: tty.c,v 1.68.4.2 1996/06/06 16:04:52 thorpej Exp $ */
/*-
@@ -693,7 +693,7 @@ ttyoutput(c, tp)
case CONTROL:
break;
case NEWLINE:
- if (ISSET(tp->t_oflag, ONLRET))
+ if (ISSET(tp->t_oflag, ONLRET) || ISSET(tp->t_oflag, OCRNL))
col = 0;
break;
case RETURN: