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

Merge branch 'obsd-master' into master

Browse Source
This commit is contained in:
Thomas Adam 2021-10-21 12:01:10 +01:00
commit be2413292f
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd-show-options.c
View File

@ -126,6 +126,12 @@ cmd_show_options_exec(struct cmd *self, struct cmdq_item *item)
parent = 0; parent = 0;
if (o != NULL) if (o != NULL)
cmd_show_options_print(self, item, o, idx, parent); cmd_show_options_print(self, item, o, idx, parent);
else if (*name == '@') {
if (args_has(args, 'q'))
goto fail;
cmdq_error(item, "invalid option: %s", argument);
goto fail;
}
free(name); free(name);
free(argument); free(argument);

3
tty-keys.c
View File

@ -1204,6 +1204,9 @@ tty_keys_clipboard(__unused struct tty *tty, const char *buf, size_t len,
buf += 5; buf += 5;
end -= 5; end -= 5;
/* Adjust end so that it points to the start of the terminator. */
end -= terminator - 1;
/* Get the second argument. */ /* Get the second argument. */
while (end != 0 && *buf != ';') { while (end != 0 && *buf != ';') {
buf++; buf++;