circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-05 08:07:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	Makefile
	tmux.1
This commit is contained in:
Thomas Adam
2015-04-27 21:21:55 +01:00
parent 72e9ebf2ec 95195f5258
commit 94a8ef1cae
18 changed files with 1330 additions and 1089 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cfg.c
View File

@ -26,12 +26,12 @@
#include "tmux.h"
struct cmd_q *cfg_cmd_q;
int cfg_finished;
int cfg_references;
char** cfg_causes;
u_int cfg_ncauses;
struct client *cfg_client;
struct cmd_q *cfg_cmd_q;
int cfg_finished;
int cfg_references;
char **cfg_causes;
u_int cfg_ncauses;
struct client *cfg_client;
int
load_cfg(const char *path, struct cmd_q *cmdq, char **cause)
@ -113,10 +113,10 @@ cfg_default_done(unused struct cmd_q *cmdq)
}
void
cfg_add_cause(const char* fmt, ...)
cfg_add_cause(const char *fmt, ...)
{
va_list ap;
char* msg;
va_list ap;
char *msg;
va_start(ap, fmt);
xvasprintf(&msg, fmt, ap);