From fa3871b1be21a23ec14b4e8a3779f30dc04ef256 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Sun, 15 Mar 2020 20:35:52 +0000
Subject: Fix C-Space key string.

---
 key-string.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'key-string.c')

diff --git a/key-string.c b/key-string.c
index d2b31e03..38e5b8a7 100644
--- a/key-string.c
+++ b/key-string.c
@@ -257,6 +257,10 @@ key_string_lookup_key(key_code key)
 		return (out);
 	}
 
+	/* Display C-@ as C-Space. */
+	if ((key & KEYC_MASK_KEY) == 0)
+		key = ' ' | KEYC_CTRL | (key & KEYC_MASK_MOD);
+
 	/* Fill in the modifiers. */
 	if (key & KEYC_CTRL)
 		strlcat(out, "C-", sizeof out);
@@ -329,15 +333,6 @@ key_string_lookup_key(key_code key)
 		return (out);
 	}
 
-	/*
-	 * Special case: display C-@ as C-Space. Could do this below in
-	 * the (key >= 0 && key <= 32), but this way we let it be found
-	 * in key_string_table, for the unlikely chance that we might
-	 * change its name.
-	 */
-	if ((key & KEYC_MASK_KEY) == 0)
-	    key = ' ' | KEYC_CTRL | (key & KEYC_MASK_MOD);
-
 	/* Try the key against the string table. */
 	for (i = 0; i < nitems(key_string_table); i++) {
 		if (key == key_string_table[i].key)
-- 
cgit v1.2.3