circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-25 11:36:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2025-11-18 10:01:07 +00:00
parent f372112a8d 2a3ec87887
commit 348f16093c
5 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmd-source-file.c
View File

@@ -166,7 +166,7 @@ cmd_source_file_exec(struct cmd *self, struct cmdq_item *item)
char *pattern, *cwd, *expanded = NULL;
const char *path, *error;
glob_t g;
int result;
int result, parse_flags;
u_int i, j;
if (c == NULL) {
@@ -192,8 +192,11 @@ 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') && (c == NULL || ~c->flags & CLIENT_CONTROL))
cdata->flags |= CMD_PARSE_VERBOSE;
if (c == NULL || ~c->flags & CLIENT_CONTROL) {
parse_flags = cmd_get_parse_flags(self);
if (args_has(args, 'v') || (parse_flags & CMD_PARSE_VERBOSE))
cdata->flags |= CMD_PARSE_VERBOSE;
}
cwd = cmd_source_file_quote_for_glob(server_client_get_cwd(c, NULL));