=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-select-pane.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- src/usr.bin/tmux/cmd-select-pane.c 2012/07/11 07:10:15 1.14 +++ src/usr.bin/tmux/cmd-select-pane.c 2013/03/24 09:54:10 1.15 @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-select-pane.c,v 1.14 2012/07/11 07:10:15 nicm Exp $ */ +/* $OpenBSD: cmd-select-pane.c,v 1.15 2013/03/24 09:54:10 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott @@ -25,7 +25,7 @@ */ void cmd_select_pane_key_binding(struct cmd *, int); -enum cmd_retval cmd_select_pane_exec(struct cmd *, struct cmd_ctx *); +enum cmd_retval cmd_select_pane_exec(struct cmd *, struct cmd_q *); const struct cmd_entry cmd_select_pane_entry = { "select-pane", "selectp", @@ -64,19 +64,19 @@ } enum cmd_retval -cmd_select_pane_exec(struct cmd *self, struct cmd_ctx *ctx) +cmd_select_pane_exec(struct cmd *self, struct cmd_q *cmdq) { struct args *args = self->args; struct winlink *wl; struct window_pane *wp; if (self->entry == &cmd_last_pane_entry || args_has(args, 'l')) { - wl = cmd_find_window(ctx, args_get(args, 't'), NULL); + wl = cmd_find_window(cmdq, args_get(args, 't'), NULL); if (wl == NULL) return (CMD_RETURN_ERROR); if (wl->window->last == NULL) { - ctx->error(ctx, "no last pane"); + cmdq_error(cmdq, "no last pane"); return (CMD_RETURN_ERROR); } @@ -87,11 +87,11 @@ return (CMD_RETURN_NORMAL); } - if ((wl = cmd_find_pane(ctx, args_get(args, 't'), NULL, &wp)) == NULL) + if ((wl = cmd_find_pane(cmdq, args_get(args, 't'), NULL, &wp)) == NULL) return (CMD_RETURN_ERROR); if (!window_pane_visible(wp)) { - ctx->error(ctx, "pane not visible"); + cmdq_error(cmdq, "pane not visible"); return (CMD_RETURN_ERROR); } @@ -104,7 +104,7 @@ else if (args_has(self->args, 'D')) wp = window_pane_find_down(wp); if (wp == NULL) { - ctx->error(ctx, "pane not found"); + cmdq_error(cmdq, "pane not found"); return (CMD_RETURN_ERROR); }