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

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	format.c
	osdep-openbsd.c
This commit is contained in:
Thomas Adam
2016-10-12 09:45:49 +01:00
parent 27126f8797 5c49e1d0c1
commit b9dc855016
98 changed files with 2110 additions and 2229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cfg.c
View File

@ -27,15 +27,15 @@
#include "tmux.h"
char *cfg_file;
struct cmd_q *cfg_cmd_q;
int cfg_finished;
int cfg_references;
char **cfg_causes;
u_int cfg_ncauses;
struct client *cfg_client;
char *cfg_file;
static struct cmd_q *cfg_cmd_q;
int cfg_finished;
int cfg_references;
static char **cfg_causes;
static u_int cfg_ncauses;
struct client *cfg_client;
void cfg_default_done(struct cmd_q *);
static void cfg_default_done(struct cmd_q *);
void
set_cfg_file(const char *path)
@ -125,7 +125,7 @@ load_cfg(const char *path, struct cmd_q *cmdq, int quiet)
return (found);
}
void
static void
cfg_default_done(__unused struct cmd_q *cmdq)
{
if (--cfg_references != 0)