From 2b1e8d06e18e22e3196c4558f1d300f7088d2417 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 3 Jul 2020 07:00:12 +0000
Subject: [PATCH 1/2] Check if client is NULL before using it, GitHub issue
 2295.

---
 cmd-select-pane.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmd-select-pane.c b/cmd-select-pane.c
index 313deefe..b0c78d74 100644
--- a/cmd-select-pane.c
+++ b/cmd-select-pane.c
@@ -205,7 +205,7 @@ cmd_select_pane_exec(struct cmd *self, struct cmdq_item *item)
 		return (CMD_RETURN_NORMAL);
 	}
 
-	if (c->session != NULL && (c->flags & CLIENT_ACTIVEPANE))
+	if (c != NULL && c->session != NULL && (c->flags & CLIENT_ACTIVEPANE))
 		activewp = server_client_get_pane(c);
 	else
 		activewp = w->active;
@@ -214,7 +214,7 @@ cmd_select_pane_exec(struct cmd *self, struct cmdq_item *item)
 	if (window_push_zoom(w, args_has(args, 'Z')))
 		server_redraw_window(w);
 	window_redraw_active_switch(w, wp);
-	if (c->session != NULL && (c->flags & CLIENT_ACTIVEPANE))
+	if (c != NULL && c->session != NULL && (c->flags & CLIENT_ACTIVEPANE))
 		server_client_set_pane(c, wp);
 	else if (window_set_active_pane(w, wp, 1))
 		cmd_find_from_winlink_pane(current, wl, wp, 0);

From 43e1577b5d6c40369eb353322f68a12b36d609b0 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 3 Jul 2020 07:07:50 +0000
Subject: [PATCH 2/2] Missing word, from annihilannic at hotmail dot com,
 GitHub issue 2288.

---
 tmux.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tmux.1 b/tmux.1
index 275dd7e5..4d079853 100644
--- a/tmux.1
+++ b/tmux.1
@@ -2947,7 +2947,7 @@ specifies a prefix to print before each key and
 .Fl 1
 lists only the first matching key.
 .Fl a
-lists the command for keys that do have a note rather than skipping them.
+lists the command for keys that do not have a note rather than skipping them.
 .It Xo Ic send-keys
 .Op Fl FHlMRX
 .Op Fl N Ar repeat-count