From 6b9c9bb17079bf2196ea1951fe5fe7e4b6779d09 Mon Sep 17 00:00:00 2001
From: Pasi Kallinen <paxed@alt.org>
Date: Mon, 13 Apr 2020 11:10:40 +0300
Subject: [PATCH] In-game doc the extended commands accepting 'm' prefix

---
 src/cmd.c | 39 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/cmd.c b/src/cmd.c
index 6828acc80..48b5c958b 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -186,6 +186,8 @@ static int FDECL(ch2spkeys, (CHAR_P, int, int));
 static boolean FDECL(prefix_cmd, (CHAR_P));
 
 static int NDECL((*timed_occ_fn));
+static char *FDECL(doc_extcmd_flagstr, (winid, const struct ext_func_tab *,
+                                        BOOLEAN_P));
 
 static const char *readchar_queue = "";
 /* for rejecting attempts to use wizard mode commands */
@@ -338,6 +340,37 @@ doextcmd(VOID_ARGS)
     return retval;
 }
 
+static char *
+doc_extcmd_flagstr(menuwin, efp, doc)
+winid menuwin;
+const struct ext_func_tab *efp;
+boolean doc;
+{
+    static char buf[BUFSZ];
+
+    if (doc) {
+        anything any = cg.zeroany;
+
+        add_menu(menuwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
+                 "[A] Command autocompletes", MENU_ITEMFLAGS_NONE);
+        Sprintf(buf, "[m] Command accepts '%c' prefix",
+                g.Cmd.spkeys[NHKF_REQMENU]);
+        add_menu(menuwin, NO_GLYPH, &any, 0, 0, ATR_NONE, buf,
+                 MENU_ITEMFLAGS_NONE);
+        return (char *) 0;
+    } else {
+        buf[0] = '\0';
+        Sprintf(&buf[1], "%s%s",
+                (efp->flags & AUTOCOMPLETE) ? "A" : "",
+                accept_menu_prefix(efp->ef_funct) ? "m" : "");
+        if (buf[1]) {
+            buf[0] = '[';
+            Strcat(buf, "]");
+        }
+        return buf;
+    }
+}
+
 /* here after #? - now list all full-word commands and provid
    some navigation capability through the long list */
 int
@@ -453,9 +486,9 @@ doextlist(VOID_ARGS)
                              MENU_ITEMFLAGS_NONE);
                     menushown[pass] = 1;
                 }
-                Sprintf(buf, " %-14s %-3s %s",
+                Sprintf(buf, " %-14s %-4s %s",
                         efp->ef_txt,
-                        (efp->flags & AUTOCOMPLETE) ? "[A]" : " ",
+                        doc_extcmd_flagstr(menuwin, efp, FALSE),
                         efp->ef_desc);
                 add_menu(menuwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
                          buf, MENU_ITEMFLAGS_NONE);
@@ -468,6 +501,8 @@ doextlist(VOID_ARGS)
         if (*searchbuf && !n)
             add_menu(menuwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
                      "no matches", MENU_ITEMFLAGS_NONE);
+        else
+            (void) doc_extcmd_flagstr(menuwin, efp, TRUE);
 
         end_menu(menuwin, (char *) 0);
         n = select_menu(menuwin, PICK_ONE, &selected);