I applied this but changed mode-key-table just to mode-table which is
enough in the places they are used..
On Tue, May 13, 2014 at 04:26:44PM -0700, Keith Amling wrote:
> Keith
>
> ---
> cmd-bind-key.c | 8 ++++----
> cmd-unbind-key.c | 8 ++++----
> tmux.1 | 8 ++++----
> 3 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/cmd-bind-key.c b/cmd-bind-key.c
> index 4ff3ac8431bc..27a03ce11ad7 100644
> --- a/cmd-bind-key.c
> +++ b/cmd-bind-key.c
> @@ -29,12 +29,12 @@
>
> enum cmd_retval cmd_bind_key_exec(struct cmd *, struct cmd_q *);
>
> -enum cmd_retval cmd_bind_key_table(struct cmd *, struct cmd_q *, int);
> +enum cmd_retval cmd_bind_mode_key_table(struct cmd *, struct cmd_q *,
> int);
>
> const struct cmd_entry cmd_bind_key_entry = {
> "bind-key", "bind",
> "cnrt:", 1, -1,
> - "[-cnr] [-t key-table] key command [arguments]",
> + "[-cnr] [-t mode-key-table] key command [arguments]",
> 0,
> NULL,
> cmd_bind_key_exec
> @@ -67,7 +67,7 @@ cmd_bind_key_exec(struct cmd *self, struct cmd_q *cmdq)
> }
>
> if (args_has(args, 't'))
> - return (cmd_bind_key_table(self, cmdq, key));
> + return (cmd_bind_mode_key_table(self, cmdq, key));
>
> cmdlist = cmd_list_parse(args->argc - 1, args->argv + 1, NULL, 0,
> &cause);
> @@ -84,7 +84,7 @@ cmd_bind_key_exec(struct cmd *self, struct cmd_q *cmdq)
> }
>
> enum cmd_retval
> -cmd_bind_key_table(struct cmd *self, struct cmd_q *cmdq, int key)
> +cmd_bind_mode_key_table(struct cmd *self, struct cmd_q *cmdq, int key)
> {
> struct args *args = self->args;
> const char *tablename;
> diff --git a/cmd-unbind-key.c b/cmd-unbind-key.c
> index cf6ad506195f..1c4decb46b98 100644
> --- a/cmd-unbind-key.c
> +++ b/cmd-unbind-key.c
> @@ -27,12 +27,12 @@
> */
>
> enum cmd_retval cmd_unbind_key_exec(struct cmd *, struct cmd_q *);
> -enum cmd_retval cmd_unbind_key_table(struct cmd *, struct cmd_q *,
> int);
> +enum cmd_retval cmd_unbind_mode_key_table(struct cmd *, struct cmd_q
> *, int);
>
> const struct cmd_entry cmd_unbind_key_entry = {
> "unbind-key", "unbind",
> "acnt:", 0, 1,
> - "[-acn] [-t key-table] key",
> + "[-acn] [-t mode-key-table] key",
> 0,
> NULL,
> cmd_unbind_key_exec
> @@ -64,7 +64,7 @@ cmd_unbind_key_exec(struct cmd *self, struct cmd_q *cmdq)
> }
>
> if (args_has(args, 't'))
> - return (cmd_unbind_key_table(self, cmdq, key));
> + return (cmd_unbind_mode_key_table(self, cmdq, key));
>
> if (key == KEYC_NONE) {
> while (!RB_EMPTY(&key_bindings)) {
> @@ -81,7 +81,7 @@ cmd_unbind_key_exec(struct cmd *self, struct cmd_q *cmdq)
> }
>
> enum cmd_retval
> -cmd_unbind_key_table(struct cmd *self, struct cmd_q *cmdq, int key)
> +cmd_unbind_mode_key_table(struct cmd *self, struct cmd_q *cmdq, int key)
> {
> struct args *args = self->args;
> const char *tablename;
> diff --git a/tmux.1 b/tmux.1
> index c05eacfdbc53..7fd26cd7a199 100644
> --- a/tmux.1
> +++ b/tmux.1
> @@ -1842,7 +1842,7 @@ Commands related to key bindings are as follows:
> .Bl -tag -width Ds
> .It Xo Ic bind-key
> .Op Fl cnr
> -.Op Fl t Ar key-table
> +.Op Fl t Ar mode-key-table
> .Ar key Ar command Op Ar arguments
> .Xc
> .D1 (alias: Ic bind )
> @@ -1871,7 +1871,7 @@ If
> is present,
> .Ar key
> is bound in
> -.Ar key-table :
> +.Ar mode-key-table :
> the binding for command mode with
> .Fl c
> or for normal mode without.
> @@ -1929,7 +1929,7 @@ Send the prefix key, or with
> the secondary prefix key, to a window as if it was pressed.
> .It Xo Ic unbind-key
> .Op Fl acn
> -.Op Fl t Ar key-table
> +.Op Fl t Ar mode-key-table
> .Ar key
> .Xc
> .D1 (alias: Ic unbind )
> @@ -1951,7 +1951,7 @@ If
> is present,
> .Ar key
> in
> -.Ar key-table
> +.Ar mode-key-table
> is unbound: the binding for command mode with
> .Fl c
> or for normal mode without.
> --
> 1.9.1
>
>
> ------------------------------------------------------------------------------
> "Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
> Instantly run your Selenium tests across 300+ browser/OS combos.
> Get unparalleled scalability from the best Selenium testing platform available
> Simple to use. Nothing to install. Get started now for free."
> http://p.sf.net/sfu/SauceLabs
> _______________________________________________
> tmux-users mailing list
> tmux-users@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/tmux-users
------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.
Get unparalleled scalability from the best Selenium testing platform available
Simple to use. Nothing to install. Get started now for free."
http://p.sf.net/sfu/SauceLabs
_______________________________________________
tmux-users mailing list
tmux-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-users
