Make TMUX_CONF a list of files and expand leading $FOO or ~.

1 files changed, 2 insertions, 2 deletions

diff --git a/tmux.h b/tmux.h
index bcdc99a4..833e74bf 100644
--- a/tmux.h
+++ b/tmux.h
@@ -60,9 +60,9 @@ struct winlink;
 /* Client-server protocol version. */
 #define PROTOCOL_VERSION 8
 
-/* Default global configuration file. */
+/* Default configuration files. */
 #ifndef TMUX_CONF
-#define TMUX_CONF "/etc/tmux.conf"
+#define TMUX_CONF "/etc/tmux.conf:~/.tmux.conf"
 #endif
 
 /* Minimum layout cell size, NOT including border lines. */