Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2016-12-12 02:01:27 +00:00
commit dda701d95f

View File

@ -77,6 +77,8 @@ cmd_send_keys_exec(struct cmd *self, struct cmdq_item *item)
free(cause);
return (CMD_RETURN_ERROR);
}
if (args_has(args, 'X') || args->argc == 0)
wp->modeprefix = np;
}
if (args_has(args, 'X')) {
@ -84,7 +86,6 @@ cmd_send_keys_exec(struct cmd *self, struct cmdq_item *item)
cmdq_error(item, "not in a mode");
return (CMD_RETURN_ERROR);
}
wp->modeprefix = np;
if (!m->valid)
wp->mode->command(wp, c, s, args, NULL);
else