Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2014-02-19 15:05:07 +00:00
5 changed files with 12 additions and 7 deletions

View File

@ -1455,8 +1455,8 @@ window_copy_copy_buffer(struct window_pane *wp, int idx, void *buf, size_t len)
if (idx == -1) {
limit = options_get_number(&global_options, "buffer-limit");
paste_add(&global_buffers, buf, len, limit);
} else
paste_replace(&global_buffers, idx, buf, len);
} else if (paste_replace(&global_buffers, idx, buf, len) != 0)
free(buf);
}
void