diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2012-07-11 19:37:32 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2012-07-11 19:37:32 +0000 |
| commit | 1f5e6e35d5046693f0ef5ec76535f517757b7122 (patch) | |
| tree | e53808c90f3a53279554f8580d2b96df606baec3 /cmd-choose-buffer.c | |
| parent | a432fcd30617610b46d65f49b7513bf5da5694de (diff) | |
| download | rtmux-1f5e6e35d5046693f0ef5ec76535f517757b7122.tar.gz rtmux-1f5e6e35d5046693f0ef5ec76535f517757b7122.tar.bz2 rtmux-1f5e6e35d5046693f0ef5ec76535f517757b7122.zip | |
Sync OpenBSD patchset 1151:
Make command exec functions return an enum rather than -1/0/1 values and
add a new value to mean "leave client running but don't attach" to fix
problems with using some commands in a command sequence. Most of the
work by Thomas Adam, problem reported by "jspenguin" on SF bug 3535531.
Diffstat (limited to 'cmd-choose-buffer.c')
| -rw-r--r-- | cmd-choose-buffer.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cmd-choose-buffer.c b/cmd-choose-buffer.c index d08c2342..446edfeb 100644 --- a/cmd-choose-buffer.c +++ b/cmd-choose-buffer.c @@ -27,7 +27,7 @@ * Enter choice mode to choose a buffer. */ -int cmd_choose_buffer_exec(struct cmd *, struct cmd_ctx *); +enum cmd_retval cmd_choose_buffer_exec(struct cmd *, struct cmd_ctx *); void cmd_choose_buffer_callback(struct window_choose_data *); void cmd_choose_buffer_free(struct window_choose_data *); @@ -42,7 +42,7 @@ const struct cmd_entry cmd_choose_buffer_entry = { cmd_choose_buffer_exec }; -int +enum cmd_retval cmd_choose_buffer_exec(struct cmd *self, struct cmd_ctx *ctx) { struct args *args = self->args; @@ -55,20 +55,20 @@ cmd_choose_buffer_exec(struct cmd *self, struct cmd_ctx *ctx) if (ctx->curclient == NULL) { ctx->error(ctx, "must be run interactively"); - return (-1); + return (CMD_RETURN_ERROR); } if ((template = args_get(args, 'F')) == NULL) template = DEFAULT_BUFFER_LIST_TEMPLATE; if ((wl = cmd_find_window(ctx, args_get(args, 't'), NULL)) == NULL) - return (-1); + return (CMD_RETURN_ERROR); if (paste_get_top(&global_buffers) == NULL) - return (0); + return (CMD_RETURN_NORMAL); if (window_pane_set_mode(wl->window->active, &window_choose_mode) != 0) - return (0); + return (CMD_RETURN_NORMAL); if (args->argc != 0) action = xstrdup(args->argv[0]); @@ -96,7 +96,7 @@ cmd_choose_buffer_exec(struct cmd *self, struct cmd_ctx *ctx) window_choose_ready(wl->window->active, 0, cmd_choose_buffer_callback, cmd_choose_buffer_free); - return (0); + return (CMD_RETURN_NORMAL); } void |