summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2016-10-12 15:26:37 +0000
committernicm <nicm@openbsd.org>2016-10-12 15:26:37 +0000
commit9de081b8a0a84913eb8b448f0d12192b21da6844 (patch)
tree0bc9dbc53b9d3a20de45a935b7eea56c16da4835
parentTeach switchd(8) how to send set_config to the switch so we can be able (diff)
downloadwireguard-openbsd-9de081b8a0a84913eb8b448f0d12192b21da6844.tar.xz
wireguard-openbsd-9de081b8a0a84913eb8b448f0d12192b21da6844.zip
bind-key -c has gone, remove from man page, and unused table declarations.
-rw-r--r--usr.bin/tmux/tmux.112
-rw-r--r--usr.bin/tmux/tmux.h4
2 files changed, 5 insertions, 11 deletions
diff --git a/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1
index bf721dccfd3..a991c3164f8 100644
--- a/usr.bin/tmux/tmux.1
+++ b/usr.bin/tmux/tmux.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tmux.1,v 1.500 2016/10/12 14:50:14 nicm Exp $
+.\" $OpenBSD: tmux.1,v 1.501 2016/10/12 15:26:37 nicm Exp $
.\"
.\" Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
.\"
@@ -2100,7 +2100,7 @@ bind-key "'" new-window
Commands related to key bindings are as follows:
.Bl -tag -width Ds
.It Xo Ic bind-key
-.Op Fl cnr
+.Op Fl nr
.Op Fl t Ar mode-table
.Op Fl T Ar key-table
.Ar key Ar command Op Ar arguments
@@ -2155,10 +2155,7 @@ If
is present,
.Ar key
is bound in
-.Ar mode-table :
-the binding for command mode with
-.Fl c
-or for normal mode without.
+.Ar mode-table .
.Pp
To view the default bindings and possible commands, see the
.Ic list-keys
@@ -2232,7 +2229,7 @@ Send the prefix key, or with
.Fl 2
the secondary prefix key, to a window as if it was pressed.
.It Xo Ic unbind-key
-.Op Fl acn
+.Op Fl an
.Op Fl t Ar mode-table
.Op Fl T Ar key-table
.Ar key
@@ -2240,7 +2237,6 @@ the secondary prefix key, to a window as if it was pressed.
.D1 (alias: Ic unbind )
Unbind the command bound to
.Ar key .
-.Fl c ,
.Fl n ,
.Fl T
and
diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h
index 6b756fc855c..b5b50ab658b 100644
--- a/usr.bin/tmux/tmux.h
+++ b/usr.bin/tmux/tmux.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.658 2016/10/12 14:50:14 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.659 2016/10/12 15:26:37 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -1559,9 +1559,7 @@ int printflike(4, 5) hooks_wait(struct hooks *, struct cmd_q *,
struct cmd_find_state *, const char *, ...);
/* mode-key.c */
-extern struct mode_key_tree mode_key_tree_vi_edit;
extern struct mode_key_tree mode_key_tree_vi_choice;
-extern struct mode_key_tree mode_key_tree_emacs_edit;
extern struct mode_key_tree mode_key_tree_emacs_choice;
int mode_key_cmp(struct mode_key_binding *, struct mode_key_binding *);
RB_PROTOTYPE(mode_key_tree, mode_key_binding, entry, mode_key_cmp);