From f6c54f3f03353c415cfc59a65118f570972d51ff Mon Sep 17 00:00:00 2001 From: nicm Date: Wed, 3 Apr 2019 06:43:19 +0000 Subject: [PATCH] Do not load /etc/tmux.conf if given -f. --- cfg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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);