mirror of
https://github.com/tmux/tmux.git
synced 2025-09-10 21:38:19 +00:00
Change so that source-file errors are reported correctly in control
mode, from Sergei Nizovtsev in GitHub issue 4626.
This commit is contained in:
4
cfg.c
4
cfg.c
@@ -222,9 +222,13 @@ cfg_add_cause(const char *fmt, ...)
|
||||
void
|
||||
cfg_print_causes(struct cmdq_item *item)
|
||||
{
|
||||
struct client *c = cmdq_get_client(item);
|
||||
u_int i;
|
||||
|
||||
for (i = 0; i < cfg_ncauses; i++) {
|
||||
if (c != NULL && (c->flags & CLIENT_CONTROL))
|
||||
control_write(c, "%%config-error %s", cfg_causes[i]);
|
||||
else
|
||||
cmdq_print(item, "%s", cfg_causes[i]);
|
||||
free(cfg_causes[i]);
|
||||
}
|
||||
|
@@ -202,7 +202,7 @@ cmd_source_file_exec(struct cmd *self, struct cmdq_item *item)
|
||||
cdata->flags |= CMD_PARSE_QUIET;
|
||||
if (args_has(args, 'n'))
|
||||
cdata->flags |= CMD_PARSE_PARSEONLY;
|
||||
if (args_has(args, 'v'))
|
||||
if (args_has(args, 'v') && (~c->flags & CLIENT_CONTROL))
|
||||
cdata->flags |= CMD_PARSE_VERBOSE;
|
||||
|
||||
cwd = cmd_source_file_quote_for_glob(server_client_get_cwd(c, NULL));
|
||||
|
Reference in New Issue
Block a user