diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2019-04-03 06:43:20 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2019-04-03 06:43:20 +0000 |
| commit | cbd377bcfbccdfda381c7c30a2f72b445cd859a4 (patch) | |
| tree | bf21395ba788b9a4e7743993ec793fc76e9b9f40 | |
| parent | 009ef5c16ebc1ed3670bafbe4a70725f1efdbaa3 (diff) | |
Do not load /etc/tmux.conf if given -f.
| -rw-r--r-- | usr.bin/tmux/cfg.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/tmux/cfg.c b/usr.bin/tmux/cfg.c index 3d2d3b40bc0..b8b4ff5bc5c 100644 --- a/usr.bin/tmux/cfg.c +++ b/usr.bin/tmux/cfg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cfg.c,v 1.66 2019/03/12 11:16:49 nicm Exp $ */ +/* $OpenBSD: cfg.c,v 1.67 2019/04/03 06:43:19 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -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); |