===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-paste-buffer.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- src/usr.bin/tmux/cmd-paste-buffer.c	2009/07/26 12:58:44	1.5
+++ src/usr.bin/tmux/cmd-paste-buffer.c	2009/09/07 18:50:45	1.6
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-paste-buffer.c,v 1.5 2009/07/26 12:58:44 nicm Exp $ */
+/* $OpenBSD: cmd-paste-buffer.c,v 1.6 2009/09/07 18:50:45 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -45,13 +45,13 @@
 {
 	struct cmd_buffer_data	*data = self->data;
 	struct winlink		*wl;
-	struct window		*w;
+	struct window_pane	*wp;
 	struct session		*s;
 	struct paste_buffer	*pb;
 
 	if ((wl = cmd_find_window(ctx, data->target, &s)) == NULL)
 		return (-1);
-	w = wl->window;
+	wp = wl->window->active;
 
 	if (data->buffer == -1)
 		pb = paste_get_top(&s->buffers);
@@ -64,13 +64,10 @@
 
 	if (pb != NULL && *pb->data != '\0') {
 		/* -r means raw data without LF->CR conversion. */
-		if (data->chflags & CMD_CHFLAG('r')) {
-			buffer_write(
-			    w->active->out, pb->data, strlen(pb->data));
-		} else {
-			cmd_paste_buffer_lf2cr(
-			    w->active->out, pb->data, strlen(pb->data));
-		}
+		if (data->chflags & CMD_CHFLAG('r'))
+			buffer_write(wp->out, pb->data, pb->size);
+		else
+			cmd_paste_buffer_lf2cr(wp->out, pb->data, pb->size);
 	}
 
 	/* Delete the buffer if -d. */