===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-break-pane.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- src/usr.bin/tmux/cmd-break-pane.c	2015/02/05 10:29:43	1.26
+++ src/usr.bin/tmux/cmd-break-pane.c	2015/06/17 19:56:08	1.27
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-break-pane.c,v 1.26 2015/02/05 10:29:43 nicm Exp $ */
+/* $OpenBSD: cmd-break-pane.c,v 1.27 2015/06/17 19:56:08 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -32,8 +32,8 @@
 
 const struct cmd_entry cmd_break_pane_entry = {
 	"break-pane", "breakp",
-	"dPF:t:", 0, 0,
-	"[-dP] [-F format] " CMD_TARGET_PANE_USAGE,
+	"dPF:s:t:", 0, 0,
+	"[-dP] [-F format] " CMD_SRCDST_PANE_USAGE,
 	0,
 	cmd_break_pane_exec
 };
@@ -48,13 +48,19 @@
 	struct window		*w;
 	char			*name;
 	char			*cause;
-	int			 base_idx;
+	int			 idx;
 	struct format_tree	*ft;
 	const char		*template;
 	char			*cp;
 
-	if ((wl = cmd_find_pane(cmdq, args_get(args, 't'), &s, &wp)) == NULL)
+	if ((wl = cmd_find_pane(cmdq, args_get(args, 's'), &s, &wp)) == NULL)
 		return (CMD_RETURN_ERROR);
+	if ((idx = cmd_find_index(cmdq, args_get(args, 't'), &s)) == -2)
+		return (CMD_RETURN_ERROR);
+	if (idx != -1 && winlink_find_by_index(&s->windows, idx) != NULL) {
+		cmdq_error(cmdq, "index %d already in use", idx);
+		return (CMD_RETURN_ERROR);
+	}
 
 	if (window_count_panes(wl->window) == 1) {
 		cmdq_error(cmdq, "can't break with only one pane");
@@ -76,8 +82,9 @@
 	free(name);
 	layout_init(w, wp);
 
-	base_idx = options_get_number(&s->options, "base-index");
-	wl = session_attach(s, w, -1 - base_idx, &cause); /* can't fail */
+	if (idx == -1)
+		idx = -1 - options_get_number(&s->options, "base-index");
+	wl = session_attach(s, w, idx, &cause); /* can't fail */
 	if (!args_has(self->args, 'd'))
 		session_select(s, wl->idx);