=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-break-pane.c,v retrieving revision 1.9 retrieving revision 1.10 diff -c -r1.9 -r1.10 *** src/usr.bin/tmux/cmd-break-pane.c 2009/12/03 22:50:10 1.9 --- src/usr.bin/tmux/cmd-break-pane.c 2011/01/04 00:42:46 1.10 *************** *** 1,4 **** ! /* $OpenBSD: cmd-break-pane.c,v 1.9 2009/12/03 22:50:10 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott --- 1,4 ---- ! /* $OpenBSD: cmd-break-pane.c,v 1.10 2011/01/04 00:42:46 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott *************** *** 30,48 **** const struct cmd_entry cmd_break_pane_entry = { "break-pane", "breakp", ! CMD_TARGET_PANE_USAGE " [-d]", ! 0, "d", ! cmd_target_init, ! cmd_target_parse, ! cmd_break_pane_exec, ! cmd_target_free, ! cmd_target_print }; int cmd_break_pane_exec(struct cmd *self, struct cmd_ctx *ctx) { ! struct cmd_target_data *data = self->data; struct winlink *wl; struct session *s; struct window_pane *wp; --- 30,47 ---- const struct cmd_entry cmd_break_pane_entry = { "break-pane", "breakp", ! "dt:", 0, 0, ! "[-d] " CMD_TARGET_PANE_USAGE, ! 0, ! NULL, ! NULL, ! cmd_break_pane_exec }; int cmd_break_pane_exec(struct cmd *self, struct cmd_ctx *ctx) { ! struct args *args = self->args; struct winlink *wl; struct session *s; struct window_pane *wp; *************** *** 50,56 **** char *cause; int base_idx; ! if ((wl = cmd_find_pane(ctx, data->target, &s, &wp)) == NULL) return (-1); if (window_count_panes(wl->window) == 1) { --- 49,55 ---- char *cause; int base_idx; ! if ((wl = cmd_find_pane(ctx, args_get(args, 't'), &s, &wp)) == NULL) return (-1); if (window_count_panes(wl->window) == 1) { *************** *** 74,80 **** base_idx = options_get_number(&s->options, "base-index"); wl = session_attach(s, w, -1 - base_idx, &cause); /* can't fail */ ! if (!cmd_check_flag(data->chflags, 'd')) session_select(s, wl->idx); server_redraw_session(s); --- 73,79 ---- base_idx = options_get_number(&s->options, "base-index"); wl = session_attach(s, w, -1 - base_idx, &cause); /* can't fail */ ! if (!args_has(self->args, 'd')) session_select(s, wl->idx); server_redraw_session(s);