===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window-copy.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- src/usr.bin/tmux/window-copy.c	2015/08/28 12:25:42	1.131
+++ src/usr.bin/tmux/window-copy.c	2015/08/29 09:25:00	1.132
@@ -1,4 +1,4 @@
-/* $OpenBSD: window-copy.c,v 1.131 2015/08/28 12:25:42 nicm Exp $ */
+/* $OpenBSD: window-copy.c,v 1.132 2015/08/29 09:25:00 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -782,7 +782,8 @@
 {
 	struct window_copy_mode_data	*data = wp->modedata;
 	struct screen			*s = &data->screen;
-	size_t				 inputlen, n;
+	const char			*bufdata;
+	size_t				 inputlen, n, bufsize;
 	int				 np;
 	struct paste_buffer		*pb;
 	u_char				 ch;
@@ -800,17 +801,18 @@
 		*data->inputstr = '\0';
 		break;
 	case MODEKEYEDIT_PASTE:
-		if ((pb = paste_get_top()) == NULL)
+		if ((pb = paste_get_top(NULL)) == NULL)
 			break;
-		for (n = 0; n < pb->size; n++) {
-			ch = (u_char) pb->data[n];
+		bufdata = paste_buffer_data(pb, &bufsize);
+		for (n = 0; n < bufsize; n++) {
+			ch = (u_char)bufdata[n];
 			if (ch < 32 || ch == 127)
 				break;
 		}
 		inputlen = strlen(data->inputstr);
 
 		data->inputstr = xrealloc(data->inputstr, inputlen + n + 1);
-		memcpy(data->inputstr + inputlen, pb->data, n);
+		memcpy(data->inputstr + inputlen, bufdata, n);
 		data->inputstr[inputlen + n] = '\0';
 		break;
 	case MODEKEYEDIT_ENTER:
@@ -1491,7 +1493,8 @@
 {
 	char				*buf;
 	struct paste_buffer		*pb;
-	size_t				 len;
+	const char			*bufdata;
+	size_t				 len, bufsize;
 	struct screen_write_ctx		 ctx;
 
 	buf = window_copy_get_selection(wp, &len);
@@ -1504,17 +1507,16 @@
 		screen_write_stop(&ctx);
 	}
 
-	if (bufname == NULL || *bufname == '\0') {
-		pb = paste_get_top();
-		if (pb != NULL)
-			bufname = pb->name;
-	} else
+	if (bufname == NULL || *bufname == '\0')
+		pb = paste_get_top(&bufname);
+	else
 		pb = paste_get_name(bufname);
 	if (pb != NULL) {
-		buf = xrealloc(buf, len + pb->size);
-		memmove(buf + pb->size, buf, len);
-		memcpy(buf, pb->data, pb->size);
-		len += pb->size;
+		bufdata = paste_buffer_data(pb, &bufsize);
+		buf = xrealloc(buf, len + bufsize);
+		memmove(buf + bufsize, buf, len);
+		memcpy(buf, bufdata, bufsize);
+		len += bufsize;
 	}
 	if (paste_set(buf, len, bufname, NULL) != 0)
 		free(buf);