Change key-table to mode-table to allow for some future work. From Keith

Amling.

diff --git a/usr.bin/tmux/cmd-bind-key.c b/usr.bin/tmux/cmd-bind-key.c
index b6f4564..7127cb9 100644 (file)
--- a/usr.bin/tmux/cmd-bind-key.c
+++ b/usr.bin/tmux/cmd-bind-key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-bind-key.c,v 1.17 2013/10/10 12:00:18 nicm Exp $ */
+/* $OpenBSD: cmd-bind-key.c,v 1.18 2014/05/14 06:45:35 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -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_key_mode_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-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_key_mode_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_key_mode_table(struct cmd *self, struct cmd_q *cmdq, int key)
 {
        struct args                     *args = self->args;
        const char                      *tablename;

diff --git a/usr.bin/tmux/cmd-unbind-key.c b/usr.bin/tmux/cmd-unbind-key.c
index a54ef6f..e1003c0 100644 (file)
--- a/usr.bin/tmux/cmd-unbind-key.c
+++ b/usr.bin/tmux/cmd-unbind-key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-unbind-key.c,v 1.18 2013/10/11 08:06:03 nicm Exp $ */
+/* $OpenBSD: cmd-unbind-key.c,v 1.19 2014/05/14 06:45:35 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -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_key_mode_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-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_key_mode_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_key_mode_table(struct cmd *self, struct cmd_q *cmdq, int key)
 {
        struct args                     *args = self->args;
        const char                      *tablename;

diff --git a/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1
index 38f5803..0410caf 100644 (file)
--- a/usr.bin/tmux/tmux.1
+++ b/usr.bin/tmux/tmux.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tmux.1,v 1.394 2014/05/13 08:08:32 nicm Exp $
+.\" $OpenBSD: tmux.1,v 1.395 2014/05/14 06:45:35 nicm Exp $
 .\"
 .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
 .\"
@@ -14,7 +14,7 @@
 .\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: May 13 2014 $
+.Dd $Mdocdate: May 14 2014 $
 .Dt TMUX 1
 .Os
 .Sh NAME
@@ -1861,7 +1861,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-table
 .Ar key Ar command Op Ar arguments
 .Xc
 .D1 (alias: Ic bind )
@@ -1890,7 +1890,7 @@ If
 is present,
 .Ar key
 is bound in
-.Ar key-table :
+.Ar mode-table :
 the binding for command mode with
 .Fl c
 or for normal mode without.
@@ -1948,7 +1948,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-table
 .Ar key
 .Xc
 .D1 (alias: Ic unbind )
@@ -1970,7 +1970,7 @@ If
 is present,
 .Ar key
 in
-.Ar key-table
+.Ar mode-table
 is unbound: the binding for command mode with
 .Fl c
 or for normal mode without.