mirror of https://github.com/tmux/tmux.git
Merge branch 'obsd-master' into master
commit
be2413292f
|
@ -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);
|
||||||
|
|
|
@ -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++;
|
||||||
|
|
Loading…
Reference in New Issue