From: Pasi Kallinen <paxed@alt.org>
Date: Tue, 11 Oct 2016 20:03:32 +0000 (+0300)
Subject: Show correct keybind in ext cmd list
X-Git-Tag: NetHack-3.6.1_RC01~569
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9858e46f6419d762f3ffa1445fd12626efe64741;p=nethack

Show correct keybind in ext cmd list
---

diff --git a/src/cmd.c b/src/cmd.c
index 47d072f42..437b1a19e 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -329,8 +329,9 @@ doextcmd(VOID_ARGS)
             return 0;
         }
         if (iflags.menu_requested && !accept_menu_prefix(func)) {
-            pline("'%s' prefix has no effect for this command.",
-                  visctrl(Cmd.spkeys[NHKF_REQMENU]));
+            pline("'%s' prefix has no effect for the %s command.",
+                  visctrl(Cmd.spkeys[NHKF_REQMENU]),
+                  extcmdlist[idx].ef_txt);
             iflags.menu_requested = FALSE;
         }
         retval = (*func)();
@@ -346,13 +347,18 @@ doextlist(VOID_ARGS)
     register const struct ext_func_tab *efp;
     char buf[BUFSZ];
     winid datawin;
+    char ch = cmd_from_func(doextcmd);
 
     datawin = create_nhwindow(NHW_TEXT);
     putstr(datawin, 0, "");
     putstr(datawin, 0, "            Extended Commands List");
     putstr(datawin, 0, "");
-    putstr(datawin, 0, "    Press '#', then type:");
-    putstr(datawin, 0, "");
+    if (ch) {
+        Sprintf(buf, "    Press '%s', then type:",
+                visctrl(ch));
+        putstr(datawin, 0, buf);
+        putstr(datawin, 0, "");
+    }
 
     for (efp = extcmdlist; efp->ef_txt; efp++) {
         if (!wizard && (efp->flags & WIZMODECMD))