From f4c3da432bd0bc75673b5bd4ff0485289444a7c3 Mon Sep 17 00:00:00 2001
From: nicm <nicm@openbsd.org>
Date: Tue, 13 Apr 2021 05:23:34 +0000
Subject: [PATCH] Handle C-Tab correctly with extended keys, GitHub issue 2642.

---
 usr.bin/tmux/tty-keys.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/usr.bin/tmux/tty-keys.c b/usr.bin/tmux/tty-keys.c
index 78b8090bdbf..0e210b85df6 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.144 2021/04/07 15:46:12 nicm Exp $ */
+/* $OpenBSD: tty-keys.c,v 1.145 2021/04/13 05:23:34 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -953,11 +953,14 @@ tty_keys_extended_key(struct tty *tty, const char *buf, size_t len,
 	 * Don't allow both KEYC_CTRL and as an implied modifier. Also convert
 	 * C-X into C-x and so on.
 	 */
-	if (nkey & KEYC_CTRL){
+	if (nkey & KEYC_CTRL) {
 		onlykey = (nkey & KEYC_MASK_KEY);
-		if (onlykey < 32)
-			onlykey = (nkey & ~KEYC_CTRL);
-		else {
+		if (onlykey < 32) {
+			if (onlykey != 9)
+				onlykey = (nkey & ~KEYC_CTRL);
+			else
+				onlykey = (9|KEYC_CTRL);
+		} else {
 			if (onlykey >= 97 && onlykey <= 122)
 				onlykey -= 96;
 			else if (onlykey >= 64 && onlykey <= 95)
-- 
2.20.1