From 4f38af01e0f5cb899314158ae4622a0fe5d354e2 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 1 Aug 2025 08:17:27 +0000
Subject: [PATCH 1/2] Fix reverse documentation of display-popup -s and -S,
 from Ricardo Signes.

---
 tmux.1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tmux.1 b/tmux.1
index 00d19381..6c0d3170 100644
--- a/tmux.1
+++ b/tmux.1
@@ -6939,8 +6939,8 @@ forwards any input read from stdin to the empty pane given by
 .Op Fl d Ar start-directory
 .Op Fl e Ar environment
 .Op Fl h Ar height
-.Op Fl s Ar border-style
-.Op Fl S Ar style
+.Op Fl s Ar style
+.Op Fl S Ar border-style
 .Op Fl t Ar target-pane
 .Op Fl T Ar title
 .Op Fl w Ar width

From 6d94909c08df6d5e7fffa9bde897d05833209f33 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 1 Aug 2025 09:05:51 +0000
Subject: [PATCH 2/2] Do not leak on failure, GitHub 4565.

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

diff --git a/cmd-if-shell.c b/cmd-if-shell.c
index 81518939..f0c3637c 100644
--- a/cmd-if-shell.c
+++ b/cmd-if-shell.c
@@ -124,7 +124,7 @@ cmd_if_shell_exec(struct cmd *self, struct cmdq_item *item)
 	    -1) == NULL) {
 		cmdq_error(item, "failed to run command: %s", shellcmd);
 		free(shellcmd);
-		free(cdata);
+		cmd_if_shell_free(cdata);
 		return (CMD_RETURN_ERROR);
 	}
 	free(shellcmd);