From c63c8fbf90ffdf7bc58a8f73428600ee29a6dcf5 Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <nicolas@viennot.biz>
Date: Sun, 3 Nov 2019 18:15:27 -0500
Subject: [PATCH] Only use tmate.conf, not .tmux.conf

Fixes #108
---
 cfg.c     | 16 +---------------
 session.c |  2 +-
 tmux.c    |  3 +--
 3 files changed, 3 insertions(+), 18 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);
 }
 
diff --git a/session.c b/session.c
index 91fb9c1d..ab58ed9f 100644
--- a/session.c
+++ b/session.c
@@ -249,7 +249,7 @@ session_destroy(struct session *s)
 		next_session_id = 0;
 		run_initial_client_cmd();
 	} else {
-		tmate_info("Session terminated");
+		tmate_info("Session closed");
 		tmate_write_fin();
 	}
 #endif
diff --git a/tmux.c b/tmux.c
index 60341f84..91ee316a 100644
--- a/tmux.c
+++ b/tmux.c
@@ -59,8 +59,7 @@ __dead void
 usage(void)
 {
 	fprintf(stderr,
-	    "usage: %s [-2CluvV] [-c shell-command] [-f file] [-L socket-name]\n"
-	    "            [-S socket-path] [command [flags]]\n",
+	    "usage: %s [-vVF] [-f config-file] [-S socket-path] [command [flags]]\n",
 	    __progname);
 	exit(1);
 }