Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2016-10-26 14:01:13 +01:00
commit b6f00a3945

View File

@ -73,6 +73,8 @@ cmd_load_buffer_exec(struct cmd *self, struct cmdq_item *item)
if (strcmp(path, "-") == 0) {
cdata = xcalloc(1, sizeof *cdata);
cdata->item = item;
if (bufname != NULL)
cdata->bufname = xstrdup(bufname);
error = server_set_stdin_callback(c, cmd_load_buffer_callback,