Do not load /etc/tmux.conf if given -f.

pull/1674/head
nicm 2019-04-03 06:43:19 +00:00
parent 06d58b3b7b
commit f6c54f3f03
1 changed files with 2 additions and 1 deletions

3
cfg.c
View File

@ -102,7 +102,8 @@ start_cfg(void)
cmdq_append(c, cfg_item);
}
load_cfg(TMUX_CONF, NULL, NULL, 1);
if (cfg_file == NULL)
load_cfg(TMUX_CONF, NULL, NULL, 1);
if (cfg_file == NULL && (home = find_home()) != NULL) {
xasprintf(&cfg_file, "%s/.tmux.conf", home);