Merge branch 'obsd-master'

2 files changed, 12 insertions, 2 deletions

diff --git a/arguments.c b/arguments.c
index 46777f7f..3315cef2 100644
--- a/arguments.c
+++ b/arguments.c
@@ -895,6 +895,10 @@ args_percentage(struct args *args, u_char flag, long long minval,
 		*cause = xstrdup("missing");
 		return (0);
 	}
+	if (TAILQ_EMPTY(&entry->values)) {
+		*cause = xstrdup("empty");
+		return (0);
+	}
 	value = TAILQ_LAST(&entry->values, args_values)->string;
 	return (args_string_percentage(value, minval, maxval, curval, cause));
 }
@@ -909,6 +913,10 @@ args_string_percentage(const char *value, long long minval, long long maxval,
 	size_t		 valuelen = strlen(value);
 	char		*copy;
 
+	if (valuelen == 0) {
+		*cause = xstrdup("empty");
+		return (0);
+	}
 	if (value[valuelen - 1] == '%') {
 		copy = xstrdup(value);
 		copy[valuelen - 1] = '\0';
@@ -955,6 +963,10 @@ args_percentage_and_expand(struct args *args, u_char flag, long long minval,
 		*cause = xstrdup("missing");
 		return (0);
 	}
+	if (TAILQ_EMPTY(&entry->values)) {
+		*cause = xstrdup("empty");
+		return (0);
+	}
 	value = TAILQ_LAST(&entry->values, args_values)->string;
 	return (args_string_percentage_and_expand(value, minval, maxval, curval,
 		    item, cause));
diff --git a/tmux.1 b/tmux.1
index 0c078fba..3ad3e91c 100644
--- a/tmux.1
+++ b/tmux.1
@@ -217,8 +217,6 @@ that is set does not contain
 .Qq UTF-8
 or
 .Qq UTF8 .
-This is equivalent to
-.Fl T Ar UTF-8 .
 .It Fl T Ar features
 Set terminal features for the client.
 This is a comma-separated list of features.