circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 21:56:57 +00:00
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 419:

Browse Source 
Move the check for whether to force a line wrapper lower down into the tty code
where it has access to the tty width, which is what should have been checked.
This commit is contained in:
Tiago Cunha
2009-10-23 17:11:26 +00:00
parent 516bfe7ba3
commit 97e02eae7d
2 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tty.c
View File

@ -1,4 +1,4 @@
/* $Id: tty.c,v 1.155 2009-10-23 17:08:30 tcunha Exp $ */
/* $Id: tty.c,v 1.156 2009-10-23 17:11:26 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -718,6 +718,14 @@ tty_cmd_linefeed(struct tty *tty, const struct tty_ctx *ctx)
return;
}
/*
* If this line wrapped naturally (ctx->num is nonzero), don't do
* anything - the cursor can just be moved to the last cell and wrap
* naturally.
*/
if (ctx->num && !(tty->term->flags & TERM_EARLYWRAP))
return;
if (ctx->ocy == ctx->orlower) {
tty_reset(tty);