From: Richard Russon <rich@flatcap.org>
Date: Sat, 30 Dec 2017 16:38:33 +0000 (+0000)
Subject: clang-format
X-Git-Tag: neomutt-20180223~56^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=be7983e0dff0e1b3bad2ef17671ed85b7e9a5af1;p=neomutt

clang-format
---

diff --git a/curs_main.c b/curs_main.c
index eaf34f02c..375f0e79a 100644
--- a/curs_main.c
+++ b/curs_main.c
@@ -497,7 +497,8 @@ static int main_change_folder(struct Menu *menu, int op, char *buf,
    * switch statement would need to be run. */
   mutt_folder_hook(buf);
 
-  Context = mx_open_mailbox(buf, (ReadOnly || (op == OP_MAIN_CHANGE_FOLDER_READONLY)) ? MUTT_READONLY : 0, NULL);
+  Context = mx_open_mailbox(
+      buf, (ReadOnly || (op == OP_MAIN_CHANGE_FOLDER_READONLY)) ? MUTT_READONLY : 0, NULL);
   if (Context)
   {
     menu->current = ci_first_message();
diff --git a/main.c b/main.c
index 782afd19c..7477be0ab 100644
--- a/main.c
+++ b/main.c
@@ -917,7 +917,8 @@ int main(int argc, char **argv, char **env)
     mutt_folder_hook(folder);
     mutt_startup_shutdown_hook(MUTT_STARTUPHOOK);
 
-    Context = mx_open_mailbox(folder, ((flags & MUTT_RO) || ReadOnly) ? MUTT_READONLY : 0, NULL);
+    Context = mx_open_mailbox(
+        folder, ((flags & MUTT_RO) || ReadOnly) ? MUTT_READONLY : 0, NULL);
     if (Context || !explicit_folder)
     {
 #ifdef USE_SIDEBAR
diff --git a/mutt/regex.c b/mutt/regex.c
index 1c786a9a7..7c737b5cb 100644
--- a/mutt/regex.c
+++ b/mutt/regex.c
@@ -532,7 +532,8 @@ bool mutt_replacelist_match(struct ReplaceList *rl, char *buf, size_t buflen, co
     }
 
     /* Does this pattern match? */
-    if (regexec(rl->regex->regex, str, (size_t) rl->nmatch, (regmatch_t *) pmatch, (int) 0) == 0)
+    if (regexec(rl->regex->regex, str, (size_t) rl->nmatch,
+                (regmatch_t *) pmatch, (int) 0) == 0)
     {
       mutt_debug(5, "%s matches %s\n", str, rl->regex->pattern);
       mutt_debug(5, "%d subs\n", (int) rl->regex->regex->re_nsub);
diff --git a/ncrypt/crypt.c b/ncrypt/crypt.c
index 18bfc8aaf..26389a55b 100644
--- a/ncrypt/crypt.c
+++ b/ncrypt/crypt.c
@@ -449,7 +449,7 @@ int mutt_is_application_pgp(struct Body *m)
     {
       p = mutt_param_get("x-action", m->parameter);
       if (p && ((mutt_str_strcasecmp(p, "sign") == 0) ||
-          (mutt_str_strcasecmp(p, "signclear") == 0)))
+                (mutt_str_strcasecmp(p, "signclear") == 0)))
         t |= PGPSIGN;
 
       p = mutt_param_get("format", m->parameter);
diff --git a/pattern.c b/pattern.c
index ce15ae194..d34fbb7cd 100644
--- a/pattern.c
+++ b/pattern.c
@@ -37,7 +37,6 @@
 #include <wctype.h>
 #include "mutt/mutt.h"
 #include "mutt.h"
-#include "mx.h"
 #include "pattern.h"
 #include "address.h"
 #include "body.h"
@@ -50,6 +49,7 @@
 #include "mailbox.h"
 #include "mutt_curses.h"
 #include "mutt_menu.h"
+#include "mx.h"
 #include "ncrypt/ncrypt.h"
 #include "opcodes.h"
 #include "options.h"
diff --git a/recvcmd.c b/recvcmd.c
index bca4b27fb..0bfa12f30 100644
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -467,7 +467,9 @@ static void attach_forward_bodies(FILE *fp, struct Header *hdr, struct AttachCtx
 
   if (!mime_fwd_all && !cur && (nattach > 1) && !check_can_decode(actx, cur))
   {
-    rc = query_quadoption(MimeForwardRest, _("Can't decode all tagged attachments.  MIME-forward the others?"));
+    rc = query_quadoption(
+        MimeForwardRest,
+        _("Can't decode all tagged attachments.  MIME-forward the others?"));
     if (rc == MUTT_ABORT)
       goto bail;
     else if (rc == MUTT_NO)
@@ -843,7 +845,9 @@ void mutt_attach_reply(FILE *fp, struct Header *hdr, struct AttachCtx *actx,
 
   if (nattach > 1 && !check_can_decode(actx, cur))
   {
-    rc = query_quadoption(MimeForwardRest, _("Can't decode all tagged attachments.  MIME-encapsulate the others?"));
+    rc = query_quadoption(MimeForwardRest,
+                          _("Can't decode all tagged attachments.  "
+                            "MIME-encapsulate the others?"));
     if (rc == MUTT_ABORT)
       return;
     else if (rc == MUTT_YES)