diff options
| -rw-r--r-- | usr.bin/tmux/screen.c | 4 | ||||
| -rw-r--r-- | usr.bin/tmux/tmux.1 | 42 |
2 files changed, 23 insertions, 23 deletions
diff --git a/usr.bin/tmux/screen.c b/usr.bin/tmux/screen.c index eced0ac3d53..eeac3bf762b 100644 --- a/usr.bin/tmux/screen.c +++ b/usr.bin/tmux/screen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: screen.c,v 1.57 2020/02/03 13:46:27 nicm Exp $ */ +/* $OpenBSD: screen.c,v 1.58 2020/02/05 13:06:49 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -155,8 +155,6 @@ screen_set_cursor_colour(struct screen *s, const char *colour) int screen_set_title(struct screen *s, const char *title) { - char *cp; - if (!utf8_isvalid(title)) return (0); free(s->title); diff --git a/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1 index ec2abf269da..9c888720b2e 100644 --- a/usr.bin/tmux/tmux.1 +++ b/usr.bin/tmux/tmux.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: tmux.1,v 1.709 2020/01/29 08:28:17 nicm Exp $ +.\" $OpenBSD: tmux.1,v 1.710 2020/02/05 13:06:49 nicm Exp $ .\" .\" Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> .\" @@ -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: January 29 2020 $ +.Dd $Mdocdate: February 5 2020 $ .Dt TMUX 1 .Os .Sh NAME @@ -2691,32 +2691,34 @@ command. .Op key .Xc .D1 (alias: Ic lsk ) -List all key bindings. -By default this shows all keys or any bindings for -.Ar key -in the syntax of the +List key bindings. +There are two forms: the default lists keys as .Ic bind-key -command. +commands; .Fl N -instead show keys and attached notes, i -.Ar key-table -if given or in the +lists only keys with attached notes and shows only the key and note for each +key. +.Pp +With the default form, all key tables are listed by default. +.Fl T +lists only keys in +.Ar key-table . +.Pp +With the +.Fl N +form, only keys in the .Em root and .Em prefix -key tables by default. +key tables are listed by default; +.Fl T +also lists only keys in +.Ar key-table . .Fl P -specifies a prefix to print before each key. -With +specifies a prefix to print before each key and .Fl 1 -only the first matching key and note is shown. +lists only the first matching key. .Pp -Without -.Fl N , -.Fl T -prints only keys in -.Ar key-table , -otherwise all key tables are printed. .It Xo Ic send-keys .Op Fl FHlMRX .Op Fl N Ar repeat-count |