From e337c1ba7d0a5e8895d8903fa801344f385d92d7 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Sat, 8 Jun 2019 21:48:29 +0000
Subject: [PATCH 1/2] Do not try to parse command when unsetting, GitHub issue
 1788.

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

diff --git a/options.c b/options.c
index 7d79cf30..26ce3b6f 100644
--- a/options.c
+++ b/options.c
@@ -361,7 +361,7 @@ options_array_set(struct options_entry *o, u_int idx, const char *value,
 		return (-1);
 	}
 
-	if (OPTIONS_IS_COMMAND(o)) {
+	if (OPTIONS_IS_COMMAND(o) && value != NULL) {
 		pr = cmd_parse_from_string(value, NULL);
 		switch (pr->status) {
 		case CMD_PARSE_EMPTY:

From f31847db624806b2d4e4647238bc3b37b737b84f Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Fri, 14 Jun 2019 10:33:55 +0100
Subject: [PATCH 2/2] Improve description of #{.

---
 CHANGES | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 3faf716f..b5d83e50 100644
--- a/CHANGES
+++ b/CHANGES
@@ -15,9 +15,9 @@ CHANGES FROM 2.9 to 3.0
   configuration files shouldn't need to be changed but there are the following
   differences:
 
-  1) Formats now need to be quoted, so a bare #{...} becomes "#{...}". This
-     includes #{ which may previously have looked like a comment (for example at
-     the start of a line).
+  1) #{ is now parsed as a format and is only valid after directives (%if,
+     %elif, %else), so comments starting with #{ are now syntax errors (adding
+     an extra # or a space after the # is an easy way to fix this).
 
   2) A \ on its own must be escaped or quoted as either \\ or '\' (the latter
      works on older tmux versions).