Add unit (milliseconds) to escape-time, show unset colours as "none"

rather than "invalid" and don't show the same text twice for user
options in customize mode.

3 files changed, 3 insertions, 4 deletions

diff --git a/colour.c b/colour.c
index 6ede25da..a282d182 100644
--- a/colour.c
+++ b/colour.c
@@ -128,7 +128,7 @@ colour_tostring(int c)
 	u_char		r, g, b;
 
 	if (c == -1)
-		return ("invalid");
+		return ("none");
 
 	if (c & COLOUR_FLAG_RGB) {
 		colour_split_rgb(c, &r, &g, &b);
diff --git a/options-table.c b/options-table.c
index a816f6ac..17be7ec4 100644
--- a/options-table.c
+++ b/options-table.c
@@ -277,6 +277,7 @@ const struct options_table_entry options_table[] = {
 	  .minimum = 0,
 	  .maximum = INT_MAX,
 	  .default_num = 500,
+	  .unit = "milliseconds",
 	  .text = "Time to wait before assuming a key is Escape."
 	},
 
diff --git a/window-customize.c b/window-customize.c
index 98387e50..4a16e90c 100644
--- a/window-customize.c
+++ b/window-customize.c
@@ -680,9 +680,7 @@ window_customize_draw_option(struct window_customize_modedata *data,
 	}
 	ft = format_create_from_state(NULL, NULL, &fs);
 
-	if (oe == NULL)
-		text = "This is a user option.";
-	else if (oe->text == NULL)
+	if (oe == NULL || oe->text == NULL)
 		text = "This option doesn't have a description.";
 	else
 		text = oe->text;