Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2014-04-24 12:59:00 +01:00
15 changed files with 78 additions and 68 deletions

View File

@ -68,9 +68,9 @@ cmd_paste_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
}
if (buffer == -1)
pb = paste_get_top(&global_buffers);
pb = paste_get_top();
else {
pb = paste_get_index(&global_buffers, buffer);
pb = paste_get_index(buffer);
if (pb == NULL) {
cmdq_error(cmdq, "no buffer %d", buffer);
return (CMD_RETURN_ERROR);
@ -92,9 +92,9 @@ cmd_paste_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
/* Delete the buffer if -d. */
if (args_has(args, 'd')) {
if (buffer == -1)
paste_free_top(&global_buffers);
paste_free_top();
else
paste_free_index(&global_buffers, buffer);
paste_free_index(buffer);
}
return (CMD_RETURN_NORMAL);