From 16b77194182569cad8f34a4cf1fa494409900236 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 14 Nov 2019 15:37:19 +0000
Subject: [PATCH] Fix parsing of DA with only one argument in the response and
 add 65 for VT520.

---
 cmd-kill-pane.c |  2 +-
 tmux.h          | 10 +++++++++-
 tty-keys.c      |  7 ++++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/cmd-kill-pane.c b/cmd-kill-pane.c
index 01b1f518..f0aacb2a 100644
--- a/cmd-kill-pane.c
+++ b/cmd-kill-pane.c
@@ -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/tmux.h b/tmux.h
index a68c7cbf..894a9820 100644
--- a/tmux.h
+++ b/tmux.h
@@ -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/tty-keys.c b/tty-keys.c
index f70b2c8d..66f0201a 100644
--- a/tty-keys.c
+++ b/tty-keys.c
@@ -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);