Merge delete-buffer into cmd-set-buffer.c and change the paste buffer

API so it has one paste_free() rather than free_top and free_name
(everywhere that uses it already has the right pointer).

1 files changed, 2 insertions, 6 deletions

diff --git a/cmd-paste-buffer.c b/cmd-paste-buffer.c
index cd3fc7d8..87f09ee6 100644
--- a/cmd-paste-buffer.c
+++ b/cmd-paste-buffer.c
@@ -102,12 +102,8 @@ cmd_paste_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
 			bufferevent_write(wp->event, "\033[201~", 6);
 	}
 
-	if (args_has(args, 'd')) {
-		if (bufname == NULL)
-			paste_free_top();
-		else
-			paste_free_name(bufname);
-	}
+	if (pb != NULL && args_has(args, 'd'))
+		paste_free(pb);
 
 	return (CMD_RETURN_NORMAL);
 }