aboutsummaryrefslogtreecommitdiff
path: root/cmd-load-buffer.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2015-11-14 11:38:30 +0000
committerThomas Adam <thomas@xteddy.org>2015-11-14 11:38:30 +0000
commit7b749eff3510ccf173c029a92c266e91454ce600 (patch)
tree8194d8dcf4d3364360960c741a3266cb9a9d7101 /cmd-load-buffer.c
parent23266e8e095fb590543d309ae3c8e30fcd98d6b7 (diff)
parentc56b81a2ce815f6d289232f20bb6e07cfd0e36ec (diff)
downloadrtmux-7b749eff3510ccf173c029a92c266e91454ce600.tar.gz
rtmux-7b749eff3510ccf173c029a92c266e91454ce600.tar.bz2
rtmux-7b749eff3510ccf173c029a92c266e91454ce600.zip
Merge branch 'obsd-master'
Conflicts: server.c tmux.c
Diffstat (limited to 'cmd-load-buffer.c')
-rw-r--r--cmd-load-buffer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd-load-buffer.c b/cmd-load-buffer.c
index 40bea9b7..5ac2edc3 100644
--- a/cmd-load-buffer.c
+++ b/cmd-load-buffer.c
@@ -160,7 +160,7 @@ cmd_load_buffer_callback(struct client *c, int closed, void *data)
free(saved);
}
evbuffer_add_printf(c->stderr_data, "%s", cause);
- server_push_stderr(c);
+ server_client_push_stderr(c);
free(pdata);
free(cause);
}