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, 1 insertions, 2 deletions

diff --git a/tmux.h b/tmux.h
index 8cd83e27..a8cd8532 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1435,8 +1435,7 @@ const char	*paste_buffer_data(struct paste_buffer *, size_t *);
 struct paste_buffer *paste_walk(struct paste_buffer *);
 struct paste_buffer *paste_get_top(const char **);
 struct paste_buffer *paste_get_name(const char *);
-int		 paste_free_top(void);
-int		 paste_free_name(const char *);
+void		 paste_free(struct paste_buffer *);
 void		 paste_add(char *, size_t);
 int		 paste_rename(const char *, const char *, char **);
 int		 paste_set(char *, size_t, const char *, char **);