diff options
| author | Thomas Adam <thomas@xteddy.org> | 2016-01-19 18:01:15 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2016-01-19 18:01:15 +0000 |
| commit | dc42c35f1f04d3bd431c52dde0906965c6db2d6c (patch) | |
| tree | 6b9e46226bd4ef64ab3e1c5c8bd65bdbc3cce3b9 /tmux.h | |
| parent | 5d21faa99c9a005208e88be72ef2c1e02cf6d128 (diff) | |
| parent | b5b5221c13ded5b141fa35f60c707c9c403b83a6 (diff) | |
| download | rtmux-dc42c35f1f04d3bd431c52dde0906965c6db2d6c.tar.gz rtmux-dc42c35f1f04d3bd431c52dde0906965c6db2d6c.tar.bz2 rtmux-dc42c35f1f04d3bd431c52dde0906965c6db2d6c.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'tmux.h')
| -rw-r--r-- | tmux.h | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -1,7 +1,7 @@ /* $OpenBSD$ */ /* - * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> + * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -1771,8 +1771,11 @@ long long args_strtonum(struct args *, u_char, long long, long long, char **); /* cmd-find.c */ -int cmd_find_target(struct cmd_find_state *, struct cmd_q *, - const char *, enum cmd_find_type, int); +int cmd_find_current(struct cmd_find_state *, struct cmd_q *, + int); +int cmd_find_target(struct cmd_find_state *, + struct cmd_find_state *, struct cmd_q *, const char *, + enum cmd_find_type, int); struct client *cmd_find_client(struct cmd_q *, const char *, int); void cmd_find_clear_state(struct cmd_find_state *, struct cmd_q *, int); @@ -1795,7 +1798,8 @@ char **cmd_copy_argv(int, char **); void cmd_free_argv(int, char **); char *cmd_stringify_argv(int, char **); struct cmd *cmd_parse(int, char **, const char *, u_int, char **); -int cmd_prepare_state(struct cmd *, struct cmd_q *); +int cmd_prepare_state(struct cmd *, struct cmd_q *, + struct cmd_q *); char *cmd_print(struct cmd *); int cmd_mouse_at(struct window_pane *, struct mouse_event *, u_int *, u_int *, int); |