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

Merge branch 'obsd-master'

pull/3431/head
Thomas Adam 2023-01-08 23:26:09 +00:00
parent 2a32565e0c 7c0789d2d2
commit 5086377f30
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tmux.1
View File

@ -1974,7 +1974,7 @@ For example:
$ tmux list-windows
0: ksh [159x48]
layout: bb62,159x48,0,0{79x48,0,0,79x48,80,0}
$ tmux select-layout bb62,159x48,0,0{79x48,0,0,79x48,80,0}
$ tmux select-layout 'bb62,159x48,0,0{79x48,0,0,79x48,80,0}'
.Ed
.Pp
.Nm

6
utf8.c
View File

@ -230,10 +230,13 @@ utf8_width(struct utf8_data *ud, int *width)
return (UTF8_ERROR);
}
log_debug("UTF-8 %.*s is %08X", (int)ud->size, ud->data, (u_int)wc);
<<<<<<< HEAD
#ifdef HAVE_UTF8PROC
*width = utf8proc_wcwidth(wc);
log_debug("utf8proc_wcwidth(%08X) returned %d", (u_int)wc, *width);
#else
=======
>>>>>>> obsd-master
*width = wcwidth(wc);
log_debug("wcwidth(%08X) returned %d", (u_int)wc, *width);
if (*width < 0) {
@ -243,7 +246,10 @@ utf8_width(struct utf8_data *ud, int *width)
*/
*width = (wc >= 0x80 && wc <= 0x9f) ? 0 : 1;
}
<<<<<<< HEAD
#endif
=======
>>>>>>> obsd-master
if (*width >= 0 && *width <= 0xff)
return (UTF8_DONE);
return (UTF8_ERROR);

4
window.c
View File

@ -1545,8 +1545,10 @@ window_pane_input_callback(struct client *c, __unused const char *path,
wp = window_pane_find_by_id(cdata->wp);
if (cdata->file != NULL && (wp == NULL || c->flags & CLIENT_DEAD)) {
if (wp == NULL)
if (wp == NULL) {
c->retval = 1;
c->flags |= CLIENT_EXIT;
}
file_cancel(cdata->file);
} else if (cdata->file == NULL || closed || error != 0) {
cmdq_continue(cdata->item);