circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-13 18:38:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2017-02-07 20:01:14 +00:00
commit 5aaf640629
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
format.c
View File

@ -879,9 +879,8 @@ format_replace(struct format_tree *ft, const char *key, size_t keylen,
*ptr = '\0'; *ptr = '\0';
found = format_find(ft, copy + 1, modifiers); found = format_find(ft, copy + 1, modifiers);
if (found == NULL) { if (found == NULL)
log_debug("XXX %s", copy + 1); found = format_expand(ft, copy + 1);
found = format_expand(ft, copy + 1);}
if (format_choose(ptr + 1, &left, &right) != 0) if (format_choose(ptr + 1, &left, &right) != 0)
goto fail; goto fail;

8
tty.c
View File

@ -1356,13 +1356,15 @@ tty_margin(struct tty *tty, u_int rleft, u_int rright)
if (tty->rleft == rleft && tty->rright == rright) if (tty->rleft == rleft && tty->rright == rright)
return; return;
tty->rupper = 0; tty_putcode2(tty, TTYC_CSR, tty->rupper, tty->rlower);
tty->rlower = tty->sy - 1;
tty->rleft = rleft; tty->rleft = rleft;
tty->rright = rright; tty->rright = rright;
snprintf(s, sizeof s, "\033[r\033[%u;%us", rleft + 1, rright + 1); if (rleft == 0 && rright == tty->sx - 1)
snprintf(s, sizeof s, "\033[s");
else
snprintf(s, sizeof s, "\033[%u;%us", rleft + 1, rright + 1);
tty_puts(tty, s); tty_puts(tty, s);
tty->cx = tty->cy = 0; tty->cx = tty->cy = 0;
} }