circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-12 19:39:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2017-07-21 16:01:13 +01:00
commit 26db50d6df
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
names.c
View File

@ -151,7 +151,9 @@ parse_window_name(const char *in)
if (*name != '\0') {
ptr = name + strlen(name) - 1;
while (ptr > name && !isalnum((u_char)*ptr))
while (ptr > name &&
!isalnum((u_char)*ptr) &&
!ispunct((u_char)*ptr))
*ptr-- = '\0';
}

15
tty.c
View File

@ -885,7 +885,7 @@ tty_draw_line(struct tty *tty, const struct window_pane *wp,
u_int i, j, sx, nx, width;
int flags, cleared = 0;
char buf[512];
size_t len;
size_t len, old_len;
flags = (tty->flags & TTY_NOCURSOR);
tty->flags |= TTY_NOCURSOR;
@ -973,8 +973,17 @@ tty_draw_line(struct tty *tty, const struct window_pane *wp,
}
}
if (len != 0) {
tty_attributes(tty, &last, wp);
tty_putn(tty, buf, len, width);
if (grid_cells_equal(&last, &grid_default_cell)) {
old_len = len;
while (len > 0 && buf[len - 1] == ' ')
len--;
log_debug("%s: trimmed %zu spaces", __func__,
old_len - len);
}
if (len != 0) {
tty_attributes(tty, &last, wp);
tty_putn(tty, buf, len, width);
}
}
nx = screen_size_x(s) - sx;