summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2009-10-13 08:37:16 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2009-10-13 08:37:16 +0000
commit7cf5dc5f369569796741923a3f0f6b4085e5e26c (patch)
tree5080a81edf7b98c90f6ea7eec6f7a247ad4466d5
parente60a6d8ad37fce3772d57cfa142155d0935446a7 (diff)
Don't try to use \n across scroll region when doing \r\n either.
-rw-r--r--usr.bin/tmux/tty.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/tmux/tty.c b/usr.bin/tmux/tty.c
index 76cceffda3b..659538a3adc 100644
--- a/usr.bin/tmux/tty.c
+++ b/usr.bin/tmux/tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty.c,v 1.47 2009/10/13 00:44:16 nicm Exp $ */
+/* $OpenBSD: tty.c,v 1.48 2009/10/13 08:37:15 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -1004,7 +1004,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;