From: Richard Russon <rich@flatcap.org>
Date: Mon, 23 Sep 2019 16:55:42 +0000 (+0100)
Subject: clang-format
X-Git-Tag: 2019-10-25~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=34aff838446af9cd1d6c3918c331505ae474d2b2;p=neomutt

clang-format
---

diff --git a/color.c b/color.c
index d9a23289b..4902f9cd4 100644
--- a/color.c
+++ b/color.c
@@ -1137,7 +1137,8 @@ static enum CommandResult parse_color(struct Buffer *buf, struct Buffer *s,
       mutt_extract_token(&tmp, s, MUTT_TOKEN_NO_FLAGS);
       if (mutt_str_atoui(tmp.data, &match) < 0)
       {
-        mutt_buffer_printf(err, _("%s: invalid number: %s"), color ? "color" : "mono", tmp.data);
+        mutt_buffer_printf(err, _("%s: invalid number: %s"),
+                           color ? "color" : "mono", tmp.data);
         mutt_buffer_dealloc(&tmp);
         return MUTT_CMD_WARNING;
       }
diff --git a/config/sort.c b/config/sort.c
index 199a27f0b..b1ed0bf2d 100644
--- a/config/sort.c
+++ b/config/sort.c
@@ -31,8 +31,8 @@
 #include <stdint.h>
 #include <string.h>
 #include "mutt/mutt.h"
-#include "sort2.h"
 #include "set.h"
+#include "sort2.h"
 #include "types.h"
 
 // clang-format off
diff --git a/mutt_parse.c b/mutt_parse.c
index 6cae4d618..9526526e3 100644
--- a/mutt_parse.c
+++ b/mutt_parse.c
@@ -36,9 +36,9 @@
 #include "mx.h"
 #include "ncrypt/ncrypt.h"
 
-struct ListHead AttachAllow = STAILQ_HEAD_INITIALIZER(AttachAllow);     ///< List of attachment types to be counted
+struct ListHead AttachAllow = STAILQ_HEAD_INITIALIZER(AttachAllow); ///< List of attachment types to be counted
 struct ListHead AttachExclude = STAILQ_HEAD_INITIALIZER(AttachExclude); ///< List of attachment types to be ignored
-struct ListHead InlineAllow = STAILQ_HEAD_INITIALIZER(InlineAllow);     ///< List of inline types to counted
+struct ListHead InlineAllow = STAILQ_HEAD_INITIALIZER(InlineAllow); ///< List of inline types to counted
 struct ListHead InlineExclude = STAILQ_HEAD_INITIALIZER(InlineExclude); ///< List of inline types to ignore
 
 /**
diff --git a/ncrypt/cryptglue.c b/ncrypt/cryptglue.c
index bb7e5dcfa..a4eb6f188 100644
--- a/ncrypt/cryptglue.c
+++ b/ncrypt/cryptglue.c
@@ -45,10 +45,10 @@
 #include "curs_lib.h"
 #endif
 #ifdef USE_AUTOCRYPT
+#include "email/lib.h"
 #include "autocrypt/autocrypt.h"
 #include "globals.h"
 #include "options.h"
-#include "email/lib.h"
 #endif
 
 struct Address;