enums: tidying

diff --git a/conn/conn.h b/conn/conn.h
index b772af601b978eede8be7bb21ae371c771ee5924..4ea30a9515d67e05f40033d3f26bc3fa813a867a 100644 (file)
--- a/conn/conn.h
+++ b/conn/conn.h
@@ -42,9 +42,8 @@
 #define MUTT_CONN_CONN_H
 
 #include <stdio.h>
-
-#include "connaccount.h"
 #include "conn_globals.h"
+#include "connaccount.h"
 #include "connection.h"
 #include "sasl_plain.h"
 #include "socket.h"

diff --git a/conn/socket.h b/conn/socket.h
index 7060700739acd9e11df9040f1a3916ce54a48bf5..8594c7c89026b8c74f6840ad6adff16f49666783 100644 (file)
--- a/conn/socket.h
+++ b/conn/socket.h
@@ -26,7 +26,6 @@
 
 #include <stddef.h>
 #include <time.h>
-
 #include "mutt/mutt.h"
 
 /**

diff --git a/doc/manual.xml.head b/doc/manual.xml.head
index 7b077c2261dc48ff99e91066f73b0983649db113..cd037453220fd894f91517993d4ee4eece5b4531 100644 (file)
--- a/doc/manual.xml.head
+++ b/doc/manual.xml.head
@@ -10833,7 +10833,7 @@ set timeout=15
         <ulink url="https://github.com/google/gmail-oauth2-tools/blob/master/python/oauth2.py">https://github.com/google/gmail-oauth2-tools/blob/master/python/oauth2.py</ulink>
       </para>
       <para>
-        You'll need to get your own oauth client credentials for Gmail here: 
+        You'll need to get your own oauth client credentials for Gmail here:
         <ulink url="https://console.developers.google.com/apis/credentials">https://console.developers.google.com/apis/credentials</ulink>
       </para>
       <para>

diff --git a/enriched.c b/enriched.c
index b1938f0bd172b15f693e0b250c613bc48a98cbeb..d585dc93da2e72559925620cc30ba9c8a670c8d5 100644 (file)
--- a/enriched.c
+++ b/enriched.c
@@ -58,16 +58,16 @@ enum RichAttribs
 };
 
 /**
- * struct etags - Enriched text tags
+ * struct Etags - Enriched text tags
  */
-struct etags
+struct Etags
 {
   const wchar_t *tag_name;
   int index;
 };
 
 // clang-format off
-static const struct etags EnrichedTags[] = {
+static const struct Etags EnrichedTags[] = {
   { L"param",       RICH_PARAM        },
   { L"bold",        RICH_BOLD         },
   { L"italic",      RICH_ITALIC       },

diff --git a/keymap.h b/keymap.h
index 76c90f56326fd5dfe0c4fbd010d2f9066f5c21d7..6b6ecbb429266cada9ccdec3a4cf0ad681182cca 100644 (file)
--- a/keymap.h
+++ b/keymap.h
@@ -80,12 +80,10 @@ enum MenuTypes
   MENU_KEY_SELECT_PGP,   ///< Select a PGP key
   MENU_KEY_SELECT_SMIME, ///< Select a SMIME key
 #endif
-
 #ifdef MIXMASTER
   MENU_MIX, ///< Create/edit a Mixmaster chain
 #endif
-
-  MENU_MAX
+  MENU_MAX,
 };
 
 /* the keymap trees (one for each menu) */

diff --git a/opcodes.h b/opcodes.h
index 06211b442b31dfa49f5e28532d5af1fbf35e8f01..e925e8343f74f77d01cf26c571b81adf155cbe98 100644 (file)
--- a/opcodes.h
+++ b/opcodes.h
@@ -308,7 +308,7 @@
   OPS_SMIME(_fmt) \
   OPS_CRYPT(_fmt) \
 
-enum mutt_ops {
+enum MuttOps {
 #define DEFINE_OPS(opcode, help_string) opcode,
   OPS(DEFINE_OPS)
 #undef DEFINE_OPS