Sync OpenBSD patchset 416:

Always move the cursor position on !xenl terminals, since there is no invisible
last cursor position.

Also nuke an unused variable.
This commit is contained in:
Tiago Cunha
2009-10-23 17:08:30 +00:00
parent 2e39ab59d7
commit 2f14ef61ff
2 changed files with 10 additions and 9 deletions

5
tty.c
View File

@ -1,4 +1,4 @@
/* $Id: tty.c,v 1.154 2009-10-23 17:06:23 tcunha Exp $ */
/* $Id: tty.c,v 1.155 2009-10-23 17:08:30 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -855,7 +855,8 @@ tty_cmd_cell(struct tty *tty, const struct tty_ctx *ctx)
* Should the cursor be in the last cursor position ready for a natural
* wrap? If so - and it isn't - move to and rewrite the last cell.
*/
if (ctx->ocx + wp->xoff > tty->sx - ctx->last_width) {
if (!(tty->term->flags & TERM_EARLYWRAP) &&
ctx->ocx + wp->xoff > tty->sx - ctx->last_width) {
if (tty->cx < tty->sx) {
cx = screen_size_x(s) - ctx->last_width;
tty_cursor_pane(tty, ctx, cx, ctx->ocy);