circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 13:37:12 +00:00
Code Issues Projects Releases Wiki Activity

Do not run the config file in the context of the first client, instead

Browse Source 
use no client like we did before. This means commands like new-session
won't try to attach if they are in the config file.
This commit is contained in:
nicm
2017-04-21 13:15:43 +00:00
parent 87997efe8d
commit 311dad8c28
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cfg.c
View File

@ -32,7 +32,6 @@ static char *cfg_file;
int cfg_finished; int cfg_finished;
static char **cfg_causes; static char **cfg_causes;
static u_int cfg_ncauses; static u_int cfg_ncauses;
struct client *cfg_client;
static enum cmd_retval static enum cmd_retval
cfg_done(__unused struct cmdq_item *item, __unused void *data) cfg_done(__unused struct cmdq_item *item, __unused void *data)
@ -44,8 +43,6 @@ cfg_done(__unused struct cmdq_item *item, __unused void *data)
if (!RB_EMPTY(&sessions)) if (!RB_EMPTY(&sessions))
cfg_show_causes(RB_MIN(sessions, &sessions)); cfg_show_causes(RB_MIN(sessions, &sessions));
if (cfg_client != NULL)
server_client_unref(cfg_client);
return (CMD_RETURN_NORMAL); return (CMD_RETURN_NORMAL);
} }
@ -62,20 +59,22 @@ start_cfg(void)
const char *home; const char *home;
int quiet = 0; int quiet = 0;
cfg_client = TAILQ_FIRST(&clients); /*
if (cfg_client != NULL) * Note that the configuration files are loaded without a client, so
cfg_client->references++; * NULL is passed into load_cfg() which means that commands run in the
* global queue and item->client is NULL for all commands.
*/
load_cfg(TMUX_CONF, cfg_client, NULL, 1); load_cfg(TMUX_CONF, NULL, NULL, 1);
if (cfg_file == NULL && (home = find_home()) != NULL) { if (cfg_file == NULL && (home = find_home()) != NULL) {
xasprintf(&cfg_file, "%s/.tmux.conf", home); xasprintf(&cfg_file, "%s/.tmux.conf", home);
quiet = 1; quiet = 1;
} }
if (cfg_file != NULL) if (cfg_file != NULL)
load_cfg(cfg_file, cfg_client, NULL, quiet); load_cfg(cfg_file, NULL, NULL, quiet);
cmdq_append(cfg_client, cmdq_get_callback(cfg_done, NULL)); cmdq_append(NULL, cmdq_get_callback(cfg_done, NULL));
} }
int int