diff options
| author | Thomas Adam <thomas@xteddy.org> | 2014-10-21 07:11:44 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2014-10-21 07:11:44 +0100 |
| commit | 562af864bd8ab06c416075b5742ce3bbcf6d0610 (patch) | |
| tree | 2c3900dd6b284aa52441c3fde9dfdf8383d87b54 /cmd-set-buffer.c | |
| parent | b6aef2490f086f3404f439308bb1746ec5134e9a (diff) | |
| parent | 0a1a88d63caf3a0e8b4440686e73e1f0f690e03c (diff) | |
| download | rtmux-562af864bd8ab06c416075b5742ce3bbcf6d0610.tar.gz rtmux-562af864bd8ab06c416075b5742ce3bbcf6d0610.tar.bz2 rtmux-562af864bd8ab06c416075b5742ce3bbcf6d0610.zip | |
Merge branch 'obsd-master'
Conflicts:
Makefile
cmd-list-commands.c
cmd-suspend-client.c
job.c
tmux.h
xmalloc.c
Diffstat (limited to 'cmd-set-buffer.c')
| -rw-r--r-- | cmd-set-buffer.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cmd-set-buffer.c b/cmd-set-buffer.c index 82922279..37d3763e 100644 --- a/cmd-set-buffer.c +++ b/cmd-set-buffer.c @@ -34,7 +34,6 @@ const struct cmd_entry cmd_set_buffer_entry = { "ab:n:", 0, 1, "[-a] " CMD_BUFFER_USAGE " [-n new-buffer-name] data", 0, - NULL, cmd_set_buffer_exec }; @@ -104,7 +103,7 @@ cmd_set_buffer_exec(struct cmd *self, struct cmd_q *cmdq) memcpy(pdata, pb->data, psize); } - pdata = xrealloc(pdata, 1, psize + newsize); + pdata = xrealloc(pdata, psize + newsize); memcpy(pdata + psize, args->argv[0], newsize); psize += newsize; |