There is no longer a need for a paste_stack struct or for global_buffers

to be global. Move to paste.c.
This commit is contained in:
nicm
2014-04-24 09:14:43 +00:00
parent 7ab2690be8
commit bec6c807cd
14 changed files with 63 additions and 66 deletions

View File

@ -69,9 +69,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);
@ -93,9 +93,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);