From 30e06e9d85a54648dd11b107f467c608f153f62c Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 3 Jun 2022 08:09:16 +0000
Subject: [PATCH 1/4] Do not unintentionally turn off all mouse mode when
 button is also present.

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

diff --git a/tty.c b/tty.c
index ea10e61e..49cf9795 100644
--- a/tty.c
+++ b/tty.c
@@ -814,7 +814,7 @@ tty_update_mode(struct tty *tty, int mode, struct screen *s)
 			tty_puts(tty, "\033[?1006h");
 		if (mode & MODE_MOUSE_ALL)
 			tty_puts(tty, "\033[?1000h\033[?1002h\033[?1003h");
-		if (mode & MODE_MOUSE_BUTTON)
+		else if (mode & MODE_MOUSE_BUTTON)
 			tty_puts(tty, "\033[?1000h\033[?1002h");
 		else if (mode & MODE_MOUSE_STANDARD)
 			tty_puts(tty, "\033[?1000h");

From 988e59cf3e0354209c0d068b244fb96bf1f0183f Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 2 Jun 2022 21:19:32 +0000
Subject: [PATCH 2/4] Do not attempt to use client in config file (it will be
 NULL), GitHub issue 3206.

---
 cmd-run-shell.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd-run-shell.c b/cmd-run-shell.c
index db5774d2..560eface 100644
--- a/cmd-run-shell.c
+++ b/cmd-run-shell.c
@@ -84,7 +84,7 @@ cmd_run_shell_print(struct job *job, const char *msg)
 
 	if (cdata->wp_id != -1)
 		wp = window_pane_find_by_id(cdata->wp_id);
-	if (wp == NULL && cdata->item != NULL)
+	if (wp == NULL && cdata->item != NULL && cdata->client != NULL)
 		wp = server_client_get_pane(cdata->client);
 	if (wp == NULL && cmd_find_from_nothing(&fs, 0) == 0)
 		wp = fs.wp;

From 6a9bb2a6224958474469422e3b9d667821d0df74 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Thu, 2 Jun 2022 21:44:28 +0100
Subject: [PATCH 3/4] Remove extra definition of getpeereid. From Eric N Vander
 Weele in GitHub issue 3209.

---
 compat/getpeereid.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/compat/getpeereid.c b/compat/getpeereid.c
index c4988438..c194e886 100644
--- a/compat/getpeereid.c
+++ b/compat/getpeereid.c
@@ -38,9 +38,6 @@ getpeereid(int s, uid_t *uid, gid_t *gid)
 	*gid = uc.gid;
 	return (0);
 #elif defined(HAVE_GETPEERUCRED)
-int
-getpeereid(int s, uid_t *uid, gid_t *gid)
-{
         ucred_t *ucred = NULL;
 
         if (getpeerucred(s, &ucred) == -1)
@@ -51,7 +48,6 @@ getpeereid(int s, uid_t *uid, gid_t *gid)
                 return (-1);
         ucred_free(ucred);
         return (0);
-}
 #else
 	return (getuid());
 #endif

From 0b355ae8114511e1ff6359272b164f1cdf718e80 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Thu, 9 Jun 2022 12:30:50 +0100
Subject: [PATCH 4/4] 3.3a.

---
 CHANGES      | 7 +++++++
 configure.ac | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 73848e7d..b72d1ec4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,10 @@
+CHANGES FROM 3.3 TO 3.3a
+
+* Do not crash when run-shell produces output from a config file.
+
+* Do not unintentionally turn off all mouse mode when button mode is also
+  present.
+
 CHANGES FROM 3.2a TO 3.3
 
 * Add an ACL list for users connecting to the tmux socket. Users may be
diff --git a/configure.ac b/configure.ac
index 542ae67f..2b8b3b11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # configure.ac
 
-AC_INIT([tmux], 3.3)
+AC_INIT([tmux], 3.3a)
 AC_PREREQ([2.60])
 
 AC_CONFIG_AUX_DIR(etc)