circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 00:56:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2016-01-15 12:01:11 +00:00
parent ea9873e60e d551ab8e5c
commit 506adf3764
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
environ.c
View File

@@ -196,10 +196,10 @@ void
environ_push(struct environ *env)
{
struct environ_entry *envent;
char **vp, *v;
char *v;
for (vp = environ; *vp != NULL; vp++) {
v = xstrdup(*vp);
while (*environ != NULL) {
v = xstrdup(*environ);
v[strcspn(v, "=")] = '\0';
unsetenv(v);

2
input.c
View File

@@ -100,7 +100,7 @@ struct input_ctx {
struct input_transition;
int input_split(struct input_ctx *);
int input_get(struct input_ctx *, u_int, int, int);
void input_reply(struct input_ctx *, const char *, ...);
void printflike(2, 3) input_reply(struct input_ctx *, const char *, ...);
void input_set_state(struct window_pane *, const struct input_transition *);
void input_reset_cell(struct input_ctx *);

2
tmux.h
View File

@@ -1542,7 +1542,7 @@ extern struct client *cfg_client;
void start_cfg(void);
int load_cfg(const char *, struct cmd_q *, char **);
void set_cfg_file(const char *);
void cfg_add_cause(const char *, ...);
void printflike(1, 2) cfg_add_cause(const char *, ...);
void cfg_print_causes(struct cmd_q *);
void cfg_show_causes(struct session *);