diff options
| author | Thomas Adam <thomas@xteddy.org> | 2019-06-20 09:02:26 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2019-06-20 09:02:26 +0100 |
| commit | 03945276f7010a69969714f8b581d68ee9ff92ba (patch) | |
| tree | e09fa390d09df02ebc31e696bce5db733013ba12 /cfg.c | |
| parent | b3ca410bc398e9aa7a045cf1337ca3f08c005e6e (diff) | |
| parent | cd1fc42df6d1bacac4f617e031c279ba31bc0632 (diff) | |
| download | rtmux-03945276f7010a69969714f8b581d68ee9ff92ba.tar.gz rtmux-03945276f7010a69969714f8b581d68ee9ff92ba.tar.bz2 rtmux-03945276f7010a69969714f8b581d68ee9ff92ba.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cfg.c')
| -rw-r--r-- | cfg.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -90,14 +90,14 @@ start_cfg(void) } if (cfg_file == NULL) - load_cfg(TMUX_CONF, NULL, NULL, CMD_PARSE_QUIET, NULL); + load_cfg(TMUX_CONF, c, NULL, CMD_PARSE_QUIET, NULL); if (cfg_file == NULL && (home = find_home()) != NULL) { xasprintf(&cfg_file, "%s/.tmux.conf", home); flags = CMD_PARSE_QUIET; } if (cfg_file != NULL) - load_cfg(cfg_file, NULL, NULL, flags, NULL); + load_cfg(cfg_file, c, NULL, flags, NULL); cmdq_append(NULL, cmdq_get_callback(cfg_done, NULL)); } @@ -127,6 +127,7 @@ load_cfg(const char *path, struct client *c, struct cmdq_item *item, int flags, pi.file = path; pi.line = 1; pi.item = item; + pi.c = c; pr = cmd_parse_from_file(f, &pi); fclose(f); @@ -146,7 +147,7 @@ load_cfg(const char *path, struct client *c, struct cmdq_item *item, int flags, if (item != NULL) cmdq_insert_after(item, new_item0); else - cmdq_append(c, new_item0); + cmdq_append(NULL, new_item0); cmd_list_free(pr->cmdlist); if (new_item != NULL) |