diff options
| -rw-r--r-- | usr.bin/tmux/cmd-kill-pane.c | 4 | ||||
| -rw-r--r-- | usr.bin/tmux/tmux.h | 12 | ||||
| -rw-r--r-- | usr.bin/tmux/tty-keys.c | 9 |
3 files changed, 19 insertions, 6 deletions
diff --git a/usr.bin/tmux/cmd-kill-pane.c b/usr.bin/tmux/cmd-kill-pane.c index 7652444bcf9..e74b9ef71ea 100644 --- a/usr.bin/tmux/cmd-kill-pane.c +++ b/usr.bin/tmux/cmd-kill-pane.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-kill-pane.c,v 1.26 2018/04/10 10:48:44 nicm Exp $ */ +/* $OpenBSD: cmd-kill-pane.c,v 1.27 2019/11/14 15:37:19 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -37,7 +37,7 @@ const struct cmd_entry cmd_kill_pane_entry = { .target = { 't', CMD_FIND_PANE, 0 }, - .flags = 0, + .flags = CMD_AFTERHOOK, .exec = cmd_kill_pane_exec }; diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h index 93a144b8a56..3ac08d2973a 100644 --- a/usr.bin/tmux/tmux.h +++ b/usr.bin/tmux/tmux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.h,v 1.930 2019/10/23 07:42:05 nicm Exp $ */ +/* $OpenBSD: tmux.h,v 1.931 2019/11/14 15:37:19 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -1202,6 +1202,7 @@ struct tty { TTY_VT220, TTY_VT320, TTY_VT420, + TTY_VT520, TTY_UNKNOWN } term_type; @@ -1218,7 +1219,14 @@ struct tty { struct tty_key *key_tree; }; #define TTY_TYPES \ - { "VT100", "VT101", "VT102", "VT220", "VT320", "VT420", "Unknown" } + { "VT100", \ + "VT101", \ + "VT102", \ + "VT220", \ + "VT320", \ + "VT420", \ + "VT520", \ + "Unknown" } /* TTY command context. */ struct tty_ctx { diff --git a/usr.bin/tmux/tty-keys.c b/usr.bin/tmux/tty-keys.c index 696c31a29aa..29f45ed0b6f 100644 --- a/usr.bin/tmux/tty-keys.c +++ b/usr.bin/tmux/tty-keys.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty-keys.c,v 1.114 2019/05/09 14:09:32 nicm Exp $ */ +/* $OpenBSD: tty-keys.c,v 1.115 2019/11/14 15:37:20 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -1040,7 +1040,9 @@ tty_keys_device_attributes(struct tty *tty, const char *buf, size_t len, b = strtoul(endptr + 1, &endptr, 10); if (*endptr != '\0' && *endptr != ';') b = 0; - } else + } else if (*endptr == '\0') + b = 0; + else a = b = 0; /* Store terminal type. */ @@ -1064,6 +1066,9 @@ tty_keys_device_attributes(struct tty *tty, const char *buf, size_t len, case 64: type = TTY_VT420; break; + case 65: + type = TTY_VT520; + break; } tty_set_type(tty, type); |