From: Richard Russon <rich@flatcap.org>
Date: Thu, 29 Aug 2019 13:38:57 +0000 (+0100)
Subject: clang-format
X-Git-Tag: 2019-10-25~71^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=47dad7aeca15e032461e6e815f1c6778810d3d56;p=neomutt

clang-format
---

diff --git a/browser.c b/browser.c
index 7045cffb0..b8c8f56b2 100644
--- a/browser.c
+++ b/browser.c
@@ -870,8 +870,8 @@ static int examine_mailboxes(struct Menu *menu, struct BrowserState *state)
           continue;
         case MUTT_NOTMUCH:
         case MUTT_NNTP:
-          add_folder(menu, state, mailbox_path(np->mailbox),
-                     np->mailbox->name, NULL, np->mailbox, NULL);
+          add_folder(menu, state, mailbox_path(np->mailbox), np->mailbox->name,
+                     NULL, np->mailbox, NULL);
           continue;
         default: /* Continue */
           break;
diff --git a/compose.c b/compose.c
index bf191d958..fb4eaae2c 100644
--- a/compose.c
+++ b/compose.c
@@ -370,8 +370,8 @@ static void redraw_crypt_lines(struct ComposeRedrawData *rd)
   struct Email *e = rd->email;
 
   SET_COLOR(MT_COLOR_COMPOSE_HEADER);
-  mutt_window_mvprintw(rd->win, HDR_CRYPT, 0, "%*s",
-                       HeaderPadding[HDR_CRYPT], _(Prompts[HDR_CRYPT]));
+  mutt_window_mvprintw(rd->win, HDR_CRYPT, 0, "%*s", HeaderPadding[HDR_CRYPT],
+                       _(Prompts[HDR_CRYPT]));
   NORMAL_COLOR;
 
   if ((WithCrypto & (APPLICATION_PGP | APPLICATION_SMIME)) == 0)
@@ -533,8 +533,8 @@ static void redraw_mix_line(struct ListHead *chain, struct ComposeRedrawData *rd
   char *t = NULL;
 
   SET_COLOR(MT_COLOR_COMPOSE_HEADER);
-  mutt_window_mvprintw(rd->win, HDR_MIX, 0, "%*s",
-                       HeaderPadding[HDR_MIX], _(Prompts[HDR_MIX]));
+  mutt_window_mvprintw(rd->win, HDR_MIX, 0, "%*s", HeaderPadding[HDR_MIX],
+                       _(Prompts[HDR_MIX]));
   NORMAL_COLOR;
 
   if (STAILQ_EMPTY(chain))
@@ -666,8 +666,8 @@ static void draw_envelope(struct ComposeRedrawData *rd)
   draw_envelope_addr(HDR_REPLYTO, &e->env->reply_to, rd);
 
   SET_COLOR(MT_COLOR_COMPOSE_HEADER);
-  mutt_window_mvprintw(rd->win, HDR_FCC, 0, "%*s",
-                       HeaderPadding[HDR_FCC], _(Prompts[HDR_FCC]));
+  mutt_window_mvprintw(rd->win, HDR_FCC, 0, "%*s", HeaderPadding[HDR_FCC],
+                       _(Prompts[HDR_FCC]));
   NORMAL_COLOR;
   mutt_paddstr(W, fcc);
 
diff --git a/compress.c b/compress.c
index 3c20069e6..99ca6b338 100644
--- a/compress.c
+++ b/compress.c
@@ -381,8 +381,7 @@ bool mutt_comp_can_append(struct Mailbox *m)
   if (ci->cmd_append || ci->cmd_close)
     return true;
 
-  mutt_error(_("Can't append without an append-hook or close-hook : %s"),
-             mailbox_path(m));
+  mutt_error(_("Can't append without an append-hook or close-hook : %s"), mailbox_path(m));
   return false;
 }
 
diff --git a/maildir/maildir.c b/maildir/maildir.c
index 398269850..ff1e87a72 100644
--- a/maildir/maildir.c
+++ b/maildir/maildir.c
@@ -603,8 +603,8 @@ int maildir_msg_open_new(struct Mailbox *m, struct Message *msg, struct Email *e
   while (true)
   {
     snprintf(path, sizeof(path), "%s/tmp/%s.%lld.R%" PRIu64 ".%s%s",
-             mailbox_path(m), subdir, (long long) time(NULL),
-             mutt_rand64(), NONULL(ShortHostname), suffix);
+             mailbox_path(m), subdir, (long long) time(NULL), mutt_rand64(),
+             NONULL(ShortHostname), suffix);
 
     mutt_debug(LL_DEBUG2, "Trying %s\n", path);
 
diff --git a/mx.c b/mx.c
index ee2f94ea4..787b86f8d 100644
--- a/mx.c
+++ b/mx.c
@@ -739,8 +739,7 @@ int mx_mbox_close(struct Context **ptr)
   }
 
   /* copy mails to the trash before expunging */
-  if (purge && (m->msg_deleted != 0) &&
-      (mutt_str_strcmp(mailbox_path(m), C_Trash) != 0))
+  if (purge && (m->msg_deleted != 0) && (mutt_str_strcmp(mailbox_path(m), C_Trash) != 0))
   {
     if (trash_append(ctx->mailbox) != 0)
       return -1;
@@ -889,8 +888,7 @@ int mx_mbox_sync(struct Mailbox *m, int *index_hint)
   msgcount = m->msg_count;
   deleted = m->msg_deleted;
 
-  if (purge && (m->msg_deleted != 0) &&
-      (mutt_str_strcmp(mailbox_path(m), C_Trash) != 0))
+  if (purge && (m->msg_deleted != 0) && (mutt_str_strcmp(mailbox_path(m), C_Trash) != 0))
   {
     if (trash_append(m) != 0)
       return -1;
diff --git a/sidebar.c b/sidebar.c
index c6d2c6de6..00c57b505 100644
--- a/sidebar.c
+++ b/sidebar.c
@@ -881,8 +881,8 @@ static void draw_sidebar(int num_rows, int num_cols, int div_width)
     /* check whether C_Folder is a prefix of the current folder's path */
     bool maildir_is_prefix = false;
     if ((mutt_buffer_len(m->pathbuf) > maildirlen) &&
-        (mutt_str_strncmp(C_Folder, mailbox_path(m), maildirlen) == 0) && C_SidebarDelimChars &&
-        strchr(C_SidebarDelimChars, mailbox_path(m)[maildirlen]))
+        (mutt_str_strncmp(C_Folder, mailbox_path(m), maildirlen) == 0) &&
+        C_SidebarDelimChars && strchr(C_SidebarDelimChars, mailbox_path(m)[maildirlen]))
     {
       maildir_is_prefix = true;
     }