===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -r1.256 -r1.257
--- src/usr.bin/tmux/tmux.h	2010/12/30 21:35:17	1.256
+++ src/usr.bin/tmux/tmux.h	2010/12/30 23:16:18	1.257
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.256 2010/12/30 21:35:17 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.257 2010/12/30 23:16:18 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -952,8 +952,6 @@
 
 	struct options	 options;
 
-	struct paste_stack buffers;
-
 #define SESSION_UNATTACHED 0x1	/* not attached to any clients */
 	int		 flags;
 
@@ -1256,7 +1254,6 @@
 struct cmd_buffer_data {
 	uint64_t chflags;
 
-	char	*target;
 	int	 buffer;
 
 	char	*arg;
@@ -1449,8 +1446,6 @@
 int	tty_keys_next(struct tty *);
 
 /* paste.c */
-void		 paste_init_stack(struct paste_stack *);
-void		 paste_free_stack(struct paste_stack *);
 struct paste_buffer *paste_walk_stack(struct paste_stack *, uint *);
 struct paste_buffer *paste_get_top(struct paste_stack *);
 struct paste_buffer *paste_get_index(struct paste_stack *, u_int);
@@ -1504,7 +1499,6 @@
 extern const struct cmd_entry cmd_clock_mode_entry;
 extern const struct cmd_entry cmd_command_prompt_entry;
 extern const struct cmd_entry cmd_confirm_before_entry;
-extern const struct cmd_entry cmd_copy_buffer_entry;
 extern const struct cmd_entry cmd_copy_mode_entry;
 extern const struct cmd_entry cmd_delete_buffer_entry;
 extern const struct cmd_entry cmd_detach_client_entry;
@@ -1607,8 +1601,8 @@
 size_t	cmd_srcdst_print(struct cmd *, char *, size_t);
 #define CMD_BUFFER_PANE_USAGE "[-b buffer-index] [-t target-pane]"
 #define CMD_BUFFER_WINDOW_USAGE "[-b buffer-index] [-t target-window]"
-#define CMD_BUFFER_SESSION_USAGE "[-b buffer-index] [-t target-session]"
 #define CMD_BUFFER_CLIENT_USAGE "[-b buffer-index] [-t target-client]"
+#define CMD_BUFFER_USAGE "[-b buffer-index]"
 void	cmd_buffer_init(struct cmd *, int);
 int	cmd_buffer_parse(struct cmd *, int, char **, char **);
 void	cmd_buffer_free(struct cmd *);
@@ -1638,6 +1632,7 @@
 /* server.c */
 extern struct clients clients;
 extern struct clients dead_clients;
+extern struct paste_stack global_buffers;
 int	 server_start(void);
 void	 server_update_socket(void);