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/2270/head
Thomas Adam 2020-05-26 16:01:19 +01:00
parent a4cb700269 2ced370bee
commit fd8652ceda
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tmux.1
View File

@ -2596,8 +2596,7 @@ spreads the current pane and any panes next to it out evenly.
.D1 (alias: Ic selectp )
Make pane
.Ar target-pane
the active pane in window
.Ar target-window .
the active pane in its window.
If one of
.Fl D ,
.Fl L ,
@ -3057,8 +3056,8 @@ User options may have any name, so long as they are prefixed with
and be set to any string.
For example:
.Bd -literal -offset indent
$ tmux setw -q @foo "abc123"
$ tmux showw -v @foo
$ tmux set -wq @foo "abc123"
$ tmux show -wv @foo
abc123
.Ed
.Pp

10
utf8.c
View File

@ -135,12 +135,16 @@ utf8_from_data(const struct utf8_data *ud, utf8_char *uc)
u_int offset;
if (ud->width != 1 && ud->width != 2)
return (utf8_space1.uc);
fatalx("invalid UTF-8 width");
if (ud->size == 0)
fatalx("invalid UTF-8 size");
if (ud->size > UTF8_FLAG_SIZE)
goto fail;
if (ud->size == 1)
return (utf8_build_one(ud->data[0], 1));
if (ud->size == 1) {
*uc = utf8_build_one(ud->data[0], 1);
return (UTF8_DONE);
}
m.flags = ud->size;
if (ud->width == 2)