circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2017-08-22 00:01:10 +01:00
parent ccdc369025 bbe9da063e
commit 730312e60f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tty.c
View File

@ -1609,7 +1609,8 @@ tty_cursor(struct tty *tty, u_int cx, u_int cy)
} }
/* Zero on the next line. */ /* Zero on the next line. */
if (cx == 0 && cy == thisy + 1 && thisy != tty->rlower) { if (cx == 0 && cy == thisy + 1 && thisy != tty->rlower &&
(!tty_use_margin(tty) || tty->rleft == 0)) {
tty_putc(tty, '\r'); tty_putc(tty, '\r');
tty_putc(tty, '\n'); tty_putc(tty, '\n');
goto out; goto out;
@ -1622,7 +1623,7 @@ tty_cursor(struct tty *tty, u_int cx, u_int cy)
*/ */
/* To left edge. */ /* To left edge. */
if (cx == 0) { if (cx == 0 && (!tty_use_margin(tty) || tty->rleft == 0)) {
tty_putc(tty, '\r'); tty_putc(tty, '\r');
goto out; goto out;
} }