Sync OpenBSD patchset 402:

Instead of using something sort of similar for both newline checks, use
something the same. Doesn't fix the bug I'm looking for though :-/.
This commit is contained in:
Tiago Cunha 2009-10-15 01:42:07 +00:00
parent 6103628129
commit fe99f6fa11

7
tty.c
View File

@ -1,4 +1,4 @@
/* $Id: tty.c,v 1.150 2009-10-15 01:41:14 tcunha Exp $ */
/* $Id: tty.c,v 1.151 2009-10-15 01:42:07 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -466,8 +466,9 @@ tty_draw_line(struct tty *tty, struct screen *s, u_int py, u_int ox, u_int oy)
gl = NULL;
if (py != 0)
gl = &s->grid->linedata[s->grid->hsize + py - 1];
if (ox != 0 || (gl != NULL && !(gl->flags & GRID_LINE_WRAPPED)) ||
tty->cy != oy + py - 1 || tty->cx < tty->sx)
if (oy + py == 0 || (gl != NULL && !(gl->flags & GRID_LINE_WRAPPED)) ||
tty->cx < tty->sx || ox != 0 ||
(oy + py != tty->cy + 1 && tty->cy != s->rlower + oy))
tty_cursor(tty, ox, oy + py);
for (i = 0; i < sx; i++) {