aboutsummaryrefslogtreecommitdiff
path: root/cmd-load-buffer.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2014-02-16 23:02:07 +0000
committerThomas Adam <thomas@xteddy.org>2014-02-16 23:02:07 +0000
commitb3de4a3dec85bc84bb83da6b46e2a8e2a634ace3 (patch)
tree8704cc16b1ed5380bcd7c678351d85adfd5907c8 /cmd-load-buffer.c
parent8edbbb98656a76f0a25b5243b526709a67ae3531 (diff)
parent81db6bab91309e7cb42628048408c10504522a48 (diff)
downloadrtmux-b3de4a3dec85bc84bb83da6b46e2a8e2a634ace3.tar.gz
rtmux-b3de4a3dec85bc84bb83da6b46e2a8e2a634ace3.tar.bz2
rtmux-b3de4a3dec85bc84bb83da6b46e2a8e2a634ace3.zip
Merge branch 'obsd-master'
Conflicts: tmux.1 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 4acbab5e..6540aedc 100644
--- a/cmd-load-buffer.c
+++ b/cmd-load-buffer.c
@@ -72,7 +72,7 @@ cmd_load_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
buffer_ptr = xmalloc(sizeof *buffer_ptr);
*buffer_ptr = buffer;
- error = server_set_stdin_callback (c, cmd_load_buffer_callback,
+ error = server_set_stdin_callback(c, cmd_load_buffer_callback,
buffer_ptr, &cause);
if (error != 0) {
cmdq_error(cmdq, "%s: %s", path, cause);