aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2009-10-15 01:44:15 +0000
committerTiago Cunha <tcunha@gmx.com>2009-10-15 01:44:15 +0000
commitb8e4bd2029787eb0698435af4b1464c28f11d4a3 (patch)
treed0d98593a692d02a2e1a1b5377603cbadb931664
parent941032b707e0478504c167a5151306db277644bb (diff)
downloadrtmux-b8e4bd2029787eb0698435af4b1464c28f11d4a3.tar.gz
rtmux-b8e4bd2029787eb0698435af4b1464c28f11d4a3.tar.bz2
rtmux-b8e4bd2029787eb0698435af4b1464c28f11d4a3.zip
Sync OpenBSD patchset 404:
Don't try to use \n across scroll region when doing \r\n either.
-rw-r--r--tty.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tty.c b/tty.c
index 412ac66e..00b8cd77 100644
--- a/tty.c
+++ b/tty.c
@@ -1,4 +1,4 @@
-/* $Id: tty.c,v 1.151 2009-10-15 01:42:07 tcunha Exp $ */
+/* $Id: tty.c,v 1.152 2009-10-15 01:44:15 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -1009,7 +1009,7 @@ tty_cursor(struct tty *tty, u_int cx, u_int cy)
}
/* Zero on the next line. */
- if (cx == 0 && cy == thisy + 1) {
+ if (cx == 0 && cy == thisy + 1 && thisy != tty->rlower) {
tty_putc(tty, '\r');
tty_putc(tty, '\n');
goto out;