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 
Conflicts:
	tmux.1
	tmux.c
This commit is contained in:
Thomas Adam
2014-02-16 23:02:07 +00:00
parent 8edbbb9865 81db6bab91
commit b3de4a3dec
14 changed files with 90 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server-fn.c
View File

@@ -454,7 +454,7 @@ server_destroy_session(struct session *s)
}
void
server_check_unattached (void)
server_check_unattached(void)
{
struct session *s;
@@ -480,7 +480,7 @@ server_set_identify(struct client *c)
tv.tv_sec = delay / 1000;
tv.tv_usec = (delay % 1000) * 1000L;
if (event_initialized (&c->identify_timer))
if (event_initialized(&c->identify_timer))
evtimer_del(&c->identify_timer);
evtimer_set(&c->identify_timer, server_callback_identify, c);
evtimer_add(&c->identify_timer, &tv);
@@ -592,7 +592,7 @@ server_set_stdin_callback(struct client *c, void (*cb)(struct client *, int,
c->references++;
if (c->stdin_closed)
c->stdin_callback (c, 1, c->stdin_callback_data);
c->stdin_callback(c, 1, c->stdin_callback_data);
server_write_client(c, MSG_STDIN, NULL, 0);