[no subject]

[Gavin D. Smith]

branch: master
commit 3b03a90e61ad6ae0b842eb0ff4eff75642466bd3
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sun Jan 28 15:53:05 2024 +0000

    * info/doc.h (FUNCTION_DOC, InfoCommand): Use "InfoCommand" as
    the sole name for this type.
---
 ChangeLog      |  5 +++++
 info/doc.h     | 11 +++++------
 info/makedoc.c |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e3735deb68..2dce139a27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-01-28  Gavin Smith <gavinsmith0123@gmail.com>
+
+       * info/doc.h (FUNCTION_DOC, InfoCommand): Use "InfoCommand" as
+       the sole name for this type.
+
 2024-01-28  Gavin Smith <gavinsmith0123@gmail.com>
 
        * info/info.h (Function, CFunction): Remove unused typedefs.
diff --git a/info/doc.h b/info/doc.h
index ec755d0bff..54396ac239 100644
--- a/info/doc.h
+++ b/info/doc.h
@@ -31,7 +31,7 @@
    appears in the user's infokey file or the default keymaps in
    infomap.c.
 
-   Each FUNCTION_DOC has a linked list of FUNCTION_KEYSEQ structs
+   Each InfoCommand has a linked list of FUNCTION_KEYSEQ structs
    hanging off it, which are created on startup when the user and/or
    default keymaps are being parsed.  */
 typedef struct function_keyseq
@@ -42,19 +42,18 @@ typedef struct function_keyseq
 } FUNCTION_KEYSEQ;
 
 /* Structure describing an Info command. */
-typedef struct
+typedef struct InfoCommand
 {
   VFunction *func;        /* Pointer to function implementing command. */
   char *func_name;        /* Name of this command. */
   FUNCTION_KEYSEQ *keys;  /* Key sequences that could invoke this command. */
   char *doc;              /* Documentation string. */
-} FUNCTION_DOC;
+} InfoCommand;
 
-/* Array of FUNCTION_DOC structures defined in doc.c, generated
+/* Array of InfoCommand structures defined in doc.c, generated
    by the makedoc utility. */
-extern FUNCTION_DOC function_doc_array[];
+extern InfoCommand function_doc_array[];
 
-typedef FUNCTION_DOC InfoCommand;
 #define InfoCmd(fn) (&function_doc_array[A_##fn])
 
 #include "infomap.h" /* for Keymap.  */
diff --git a/info/makedoc.c b/info/makedoc.c
index 3dbeee3ab4..033445b462 100644
--- a/info/makedoc.c
+++ b/info/makedoc.c
@@ -54,7 +54,7 @@ static char *doc_header_1[] = {
   "#include \"window.h\"",
   "#include \"funs.h\"",
   "",
-  "FUNCTION_DOC function_doc_array[] = {",
+  "InfoCommand function_doc_array[] = {",
   "",
   NULL
 };