3.3a.

3209.

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

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;

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

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)

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");