diff options
| author |   nicm <nicm@openbsd.org> | 2009-10-13 08:37:15 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2009-10-13 08:37:15 +0000 |
| commit | 2062a443e2ee68fd572f0ccfceace2432f98cc72 (patch) | |
| tree | 6e337886d24ef3e316ce97c2832b2f31b8f91a30 /usr.bin/tmux/tty.c | |
| parent | When a session is unattached, reset its activity timer to prevent it locking (diff) | |
| download | wireguard-openbsd-2062a443e2ee68fd572f0ccfceace2432f98cc72.tar.xz wireguard-openbsd-2062a443e2ee68fd572f0ccfceace2432f98cc72.zip | |
Don't try to use \n across scroll region when doing \r\n either.
Diffstat (limited to 'usr.bin/tmux/tty.c')
| -rw-r--r-- | usr.bin/tmux/tty.c | 4 |
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; |