From b6dfb9996a9f73c418b2291a8c29d345966eae7d Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 1 Mar 2021 10:44:38 +0000
Subject: [PATCH 1/2] Add some text with examples of ; as a separator, GitHub
 issues 2522 and 2580.

---
 tmux.1 | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/tmux.1 b/tmux.1
index a88a1d34..ee07546b 100644
--- a/tmux.1
+++ b/tmux.1
@@ -522,6 +522,69 @@ Commands separated by semicolons together form a
 - if a command in the sequence encounters an error, no subsequent commands are
 executed.
 .Pp
+It is recommended that a semicolon used as a command separator should be
+written as an individual token, for example from
+.Xr sh 1 :
+.Bd -literal -offset indent
+$ tmux neww \\; splitw
+.Ed
+.Pp
+Or:
+.Bd -literal -offset indent
+$ tmux neww ';' splitw
+.Ed
+.Pp
+Or from the tmux command prompt:
+.Bd -literal -offset indent
+neww ; splitw
+.Ed
+.Pp
+However, a trailing semicolon is also interpreted as a command separator,
+for example in these
+.Xr sh 1
+commands:
+.Bd -literal -offset indent
+$ tmux neww\\; splitw
+.Ed
+.Pp
+Or:
+.Bd -literal -offset indent
+$ tmux 'neww;' splitw
+.Ed
+.Pp
+As in these examples, when running tmux from the shell extra care must be taken
+to properly quote semicolons:
+.Bl -enum -offset Ds
+.It
+Semicolons that should be interpreted as a command separator
+should be escaped according to the shell conventions.
+For
+.Xr sh 1
+this typically means quoted (such as
+.Ql neww ';' splitw )
+or escaped (such as
+.Ql neww \\\\; splitw ) .
+.It
+Individual semicolons or trailing semicolons that should be interpreted as
+arguments should be escaped twice: once according to the shell conventions and
+a second time for
+.Nm ;
+for example:
+.Bd -literal -offset indent
+$ tmux neww 'foo\\;' bar
+$ tmux neww foo\\\\; bar
+.Ed
+.Pp
+.It
+Semicolons that are not individual tokens or trailing another token should only
+be escaped once according to shell conventions; for example:
+.Bd -literal -offset indent
+$ tmux neww 'foo-;-bar'
+$ tmux neww foo-\\;-bar
+.Ed
+.Pp
+.El
+.Pp
 Comments are marked by the unquoted # character - any remaining text after a
 comment is ignored until the end of the line.
 .Pp

From 8a4a2153fdec71397fe555073d4d77ee68947fff Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 1 Mar 2021 10:50:14 +0000
Subject: [PATCH 2/2] There is no need to call del_curterm in the server
 anymore.

---
 tty-term.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tty-term.c b/tty-term.c
index c8048f77..9df50948 100644
--- a/tty-term.c
+++ b/tty-term.c
@@ -521,9 +521,6 @@ tty_term_create(struct tty *tty, char *name, char **caps, u_int ncaps,
 		a = options_array_next(a);
 	}
 
-	/* Delete curses data. */
-	del_curterm(cur_term);
-
 	/* Apply overrides so any capabilities used for features are changed. */
 	tty_term_apply_overrides(term);