summaryrefslogtreecommitdiffstats
path: root/cfg.c
diff options
context:
space:
mode:
authorNicolas Viennot <nicolas@viennot.biz>2019-11-03 18:15:27 -0500
committerNicolas Viennot <nicolas@viennot.biz>2019-11-04 18:36:10 -0500
commitc63c8fbf90ffdf7bc58a8f73428600ee29a6dcf5 (patch)
tree5ee863522aa7f5e9a9ed4e53c375cc4fb50303c7 /cfg.c
parent6e84bab68ca80f90023d4336467a44098d17a06f (diff)
Only use tmate.conf, not .tmux.conf
Fixes #108
Diffstat (limited to 'cfg.c')
-rw-r--r--cfg.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/cfg.c b/cfg.c
index 68894cb2..1fcbd0d6 100644
--- a/cfg.c
+++ b/cfg.c
@@ -71,7 +71,7 @@ start_cfg(void)
cfg_add_cause("%s: %s", TMUX_CONF, strerror(errno));
if (cfg_file == NULL && (home = find_home()) != NULL) {
- xasprintf(&cfg_file, "%s/.tmux.conf", home);
+ xasprintf(&cfg_file, "%s/.tmate.conf", home);
if (access(cfg_file, R_OK) != 0 && errno == ENOENT) {
free(cfg_file);
cfg_file = NULL;
@@ -81,20 +81,6 @@ start_cfg(void)
cfg_add_cause("%s: %s", cfg_file, cause);
free(cause);
-#ifdef TMATE
- cause = NULL;
- if ((home = find_home()) != NULL) {
- xasprintf(&tmate_cfg_file, "%s/.tmate.conf", home);
- if (access(tmate_cfg_file, R_OK) != 0 && errno == ENOENT) {
- free(tmate_cfg_file);
- tmate_cfg_file = NULL;
- }
- }
- if (tmate_cfg_file != NULL && load_cfg(tmate_cfg_file, cfg_cmd_q, &cause) == -1)
- cfg_add_cause("%s: %s", cfg_file, cause);
- free(cause);
-#endif
-
cmdq_continue(cfg_cmd_q);
}