patch 8.2.3731: "set! termcap" shows codes in one column, but not keys
Problem: "set! termcap" shows codes in one column, but not keys.
Solution: Also use one column for keys. (closes #9258)
diff --git a/src/term.c b/src/term.c
index c20da0c..a8819a3 100644
--- a/src/term.c
+++ b/src/term.c
@@ -6217,9 +6217,10 @@
/*
* Show all termcodes (for ":set termcap")
* This code looks a lot like showoptions(), but is different.
+ * "flags" can have OPT_ONECOLUMN.
*/
void
-show_termcodes(void)
+show_termcodes(int flags)
{
int col;
int *items;
@@ -6244,12 +6245,13 @@
msg_puts_title(_("\n--- Terminal keys ---"));
/*
- * do the loop two times:
+ * Do the loop three times:
* 1. display the short items (non-strings and short strings)
* 2. display the medium items (medium length strings)
* 3. display the long items (remaining strings)
+ * When "flags" has OPT_ONECOLUMN do everything in 3.
*/
- for (run = 1; run <= 3 && !got_int; ++run)
+ for (run = (flags & OPT_ONECOLUMN) ? 3 : 1; run <= 3 && !got_int; ++run)
{
/*
* collect the items in items[]
@@ -6259,9 +6261,10 @@
{
len = show_one_termcode(termcodes[i].name,
termcodes[i].code, FALSE);
- if (len <= INC3 - GAP ? run == 1
+ if ((flags & OPT_ONECOLUMN) ||
+ (len <= INC3 - GAP ? run == 1
: len <= INC2 - GAP ? run == 2
- : run == 3)
+ : run == 3))
items[item_count++] = i;
}