summaryrefslogtreecommitdiffstats
path: root/cfg.c
diff options
context:
space:
mode:
authornicm <nicm>2019-04-03 06:43:19 +0000
committernicm <nicm>2019-04-03 06:43:19 +0000
commitf6c54f3f03353c415cfc59a65118f570972d51ff (patch)
treec7f5138cf4c4e1247ef40d973cfcd200669d55da /cfg.c
parent06d58b3b7b4c20828681e24007d8b9bc1d35fdad (diff)
Do not load /etc/tmux.conf if given -f.
Diffstat (limited to 'cfg.c')
-rw-r--r--cfg.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/cfg.c b/cfg.c
index d8ce40d3..1a7e4375 100644
--- a/cfg.c
+++ b/cfg.c
@@ -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);