===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-break-pane.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- src/usr.bin/tmux/cmd-break-pane.c	2017/04/22 08:56:24	1.44
+++ src/usr.bin/tmux/cmd-break-pane.c	2017/04/22 10:22:39	1.45
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-break-pane.c,v 1.44 2017/04/22 08:56:24 nicm Exp $ */
+/* $OpenBSD: cmd-break-pane.c,v 1.45 2017/04/22 10:22:39 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -35,10 +35,11 @@
 	.alias = "breakp",
 
 	.args = { "dPF:n:s:t:", 0, 0 },
-	.usage = "[-dP] [-F format] [-n window-name] [-s src-pane] [-t dst-window]",
+	.usage = "[-dP] [-F format] [-n window-name] [-s src-pane] "
+		 "[-t dst-window]",
 
-	.sflag = CMD_PANE,
-	.tflag = CMD_WINDOW_INDEX,
+	.source = { 's', CMD_FIND_PANE, 0 },
+	.target = { 't', CMD_FIND_WINDOW, CMD_FIND_WINDOW_INDEX },
 
 	.flags = 0,
 	.exec = cmd_break_pane_exec
@@ -49,14 +50,14 @@
 {
 	struct args		*args = self->args;
 	struct cmd_find_state	*current = &item->shared->current;
-	struct client		*c = item->state.c;
-	struct winlink		*wl = item->state.sflag.wl;
-	struct session		*src_s = item->state.sflag.s;
-	struct session		*dst_s = item->state.tflag.s;
-	struct window_pane	*wp = item->state.sflag.wp;
+	struct client		*c = cmd_find_client(item, NULL, 1);
+	struct winlink		*wl = item->source.wl;
+	struct session		*src_s = item->source.s;
+	struct session		*dst_s = item->target.s;
+	struct window_pane	*wp = item->source.wp;
 	struct window		*w = wl->window;
 	char			*name, *cause;
-	int			 idx = item->state.tflag.idx;
+	int			 idx = item->target.idx;
 	const char		*template;
 	char			*cp;