From: Richard Russon <rich@flatcap.org>
Date: Thu, 3 Jan 2019 13:36:30 +0000 (+0000)
Subject: clang-format
X-Git-Tag: 2019-10-25~404
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dd73491868cffcb4d311e6be31d32e63c1534519;p=neomutt

clang-format
---

diff --git a/browser.c b/browser.c
index 22074107c..5e4b8f412 100644
--- a/browser.c
+++ b/browser.c
@@ -54,8 +54,8 @@
 #include "keymap.h"
 #include "mailbox.h"
 #include "maildir/lib.h"
-#include "mutt_menu.h"
 #include "mutt_attach.h"
+#include "mutt_menu.h"
 #include "mutt_window.h"
 #include "muttlib.h"
 #include "mx.h"
diff --git a/color.c b/color.c
index 3c08ee756..76b3df880 100644
--- a/color.c
+++ b/color.c
@@ -40,8 +40,8 @@
 #include "globals.h"
 #include "keymap.h"
 #include "mailbox.h"
-#include "mutt_menu.h"
 #include "mutt_curses.h"
+#include "mutt_menu.h"
 #include "options.h"
 #include "pattern.h"
 
diff --git a/commands.c b/commands.c
index c58b1cf2e..18ec9d9b6 100644
--- a/commands.c
+++ b/commands.c
@@ -51,9 +51,9 @@
 #include "hook.h"
 #include "keymap.h"
 #include "mailbox.h"
-#include "mutt_menu.h"
 #include "mutt_curses.h"
 #include "mutt_logging.h"
+#include "mutt_menu.h"
 #include "mutt_parse.h"
 #include "mutt_window.h"
 #include "muttlib.h"
diff --git a/compose.c b/compose.c
index 6b38731fb..365982a58 100644
--- a/compose.c
+++ b/compose.c
@@ -53,11 +53,11 @@
 #include "index.h"
 #include "keymap.h"
 #include "mailbox.h"
-#include "mutt_menu.h"
 #include "mutt_attach.h"
 #include "mutt_curses.h"
 #include "mutt_header.h"
 #include "mutt_logging.h"
+#include "mutt_menu.h"
 #include "mutt_window.h"
 #include "muttlib.h"
 #include "mx.h"
diff --git a/conn/ssl.c b/conn/ssl.c
index 49b5d4281..2cd0034ef 100644
--- a/conn/ssl.c
+++ b/conn/ssl.c
@@ -57,9 +57,9 @@
 #include "connection.h"
 #include "globals.h"
 #include "keymap.h"
-#include "mutt_menu.h"
 #include "mutt_account.h"
 #include "mutt_logging.h"
+#include "mutt_menu.h"
 #include "muttlib.h"
 #include "opcodes.h"
 #include "options.h"
diff --git a/conn/ssl_gnutls.c b/conn/ssl_gnutls.c
index e63f10343..eaea3e204 100644
--- a/conn/ssl_gnutls.c
+++ b/conn/ssl_gnutls.c
@@ -43,8 +43,8 @@
 #include "connaccount.h"
 #include "connection.h"
 #include "keymap.h"
-#include "mutt_menu.h"
 #include "mutt_account.h"
+#include "mutt_menu.h"
 #include "muttlib.h"
 #include "opcodes.h"
 #include "options.h"
diff --git a/curs_lib.c b/curs_lib.c
index 719212529..ffdf69f51 100644
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -52,9 +52,9 @@
 #include "enter_state.h"
 #include "globals.h"
 #include "mailbox.h"
-#include "mutt_menu.h"
 #include "mutt_curses.h"
 #include "mutt_logging.h"
+#include "mutt_menu.h"
 #include "mutt_window.h"
 #include "muttlib.h"
 #include "opcodes.h"
diff --git a/email/parse.c b/email/parse.c
index 10186ed27..082802eaa 100644
--- a/email/parse.c
+++ b/email/parse.c
@@ -54,7 +54,7 @@
  * mutt_auto_subscribe - Check if user is subscribed to mailing list
  * @param mailto URI of mailing list subscribe
  */
-void mutt_auto_subscribe (const char *mailto)
+void mutt_auto_subscribe(const char *mailto)
 {
   struct Envelope *lpenv;
 
@@ -68,21 +68,20 @@ void mutt_auto_subscribe (const char *mailto)
 
   lpenv = mutt_env_new(); /* parsed envelope from the List-Post mailto: URL */
 
-  if ((url_parse_mailto (lpenv, NULL, mailto) != -1) &&
-      lpenv->to && lpenv->to->mailbox &&
+  if ((url_parse_mailto(lpenv, NULL, mailto) != -1) && lpenv->to && lpenv->to->mailbox &&
       !mutt_regexlist_match(&UnSubscribedLists, lpenv->to->mailbox) &&
       !mutt_regexlist_match(&UnMailLists, lpenv->to->mailbox) &&
       !mutt_regexlist_match(&UnSubscribedLists, lpenv->to->mailbox))
   {
     struct Buffer err;
     char errbuf[STRING];
-    memset (&err, 0, sizeof(err));
+    memset(&err, 0, sizeof(err));
     err.data = errbuf;
     err.dsize = sizeof(errbuf);
     /* mutt_regexlist_add() detects duplicates, so it is safe to
      * try to add here without any checks. */
-    mutt_regexlist_add (&MailLists, lpenv->to->mailbox, REG_ICASE, &err);
-    mutt_regexlist_add (&SubscribedLists, lpenv->to->mailbox, REG_ICASE, &err);
+    mutt_regexlist_add(&MailLists, lpenv->to->mailbox, REG_ICASE, &err);
+    mutt_regexlist_add(&SubscribedLists, lpenv->to->mailbox, REG_ICASE, &err);
   }
 
   mutt_env_free(&lpenv);
diff --git a/flags.c b/flags.c
index d7dfac02f..a1f65b703 100644
--- a/flags.c
+++ b/flags.c
@@ -38,8 +38,8 @@
 #include "globals.h"
 #include "index.h"
 #include "mailbox.h"
-#include "mutt_menu.h"
 #include "mutt_curses.h"
+#include "mutt_menu.h"
 #include "mutt_window.h"
 #include "mx.h"
 #include "protos.h"
diff --git a/imap/command.c b/imap/command.c
index b93d89bdb..c1e26f81d 100644
--- a/imap/command.c
+++ b/imap/command.c
@@ -48,10 +48,10 @@
 #include "globals.h"
 #include "imap/imap.h"
 #include "mailbox.h"
-#include "mutt_menu.h"
 #include "message.h"
 #include "mutt_account.h"
 #include "mutt_logging.h"
+#include "mutt_menu.h"
 #include "mutt_socket.h"
 #include "mx.h"
 
diff --git a/imap/imap.c b/imap/imap.c
index 956ce7bd6..b932810ee 100644
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -1067,7 +1067,7 @@ out:
 
 /**
  * imap_sync_message_for_copy - Update server to reflect the flags of a single message
- * @param[in]  adata        Imap Mailbox
+ * @param[in]  m            Mailbox
  * @param[in]  e            Email
  * @param[in]  cmd          Buffer for the command string
  * @param[out] err_continue Did the user force a continue?
diff --git a/index.c b/index.c
index 53bbbb14e..091dcd828 100644
--- a/index.c
+++ b/index.c
@@ -52,11 +52,11 @@
 #include "hook.h"
 #include "keymap.h"
 #include "mailbox.h"
-#include "mutt_menu.h"
 #include "mutt_account.h"
 #include "mutt_curses.h"
 #include "mutt_header.h"
 #include "mutt_logging.h"
+#include "mutt_menu.h"
 #include "mutt_thread.h"
 #include "mutt_window.h"
 #include "muttlib.h"
@@ -3229,14 +3229,16 @@ int mutt_index_menu(void)
          */
         CHECK_ACL(MUTT_ACL_SEEN, _("Cannot mark messages as read"));
 
-        rc = mutt_thread_set_flag(CUR_EMAIL, MUTT_READ, 1, op == OP_MAIN_READ_THREAD ? 0 : 1);
+        rc = mutt_thread_set_flag(CUR_EMAIL, MUTT_READ, 1,
+                                  op == OP_MAIN_READ_THREAD ? 0 : 1);
 
         if (rc != -1)
         {
           if (Resolve)
           {
-            menu->current = (op == OP_MAIN_READ_THREAD ? mutt_next_thread(CUR_EMAIL) :
-                                                         mutt_next_subthread(CUR_EMAIL));
+            menu->current =
+                (op == OP_MAIN_READ_THREAD ? mutt_next_thread(CUR_EMAIL) :
+                                             mutt_next_subthread(CUR_EMAIL));
             if (menu->current == -1)
             {
               menu->current = menu->oldcurrent;
@@ -3432,7 +3434,8 @@ int mutt_index_menu(void)
          */
         CHECK_ACL(MUTT_ACL_DELETE, _("Cannot undelete messages"));
 
-        rc = mutt_thread_set_flag(CUR_EMAIL, MUTT_DELETE, 0, op == OP_UNDELETE_THREAD ? 0 : 1);
+        rc = mutt_thread_set_flag(CUR_EMAIL, MUTT_DELETE, 0,
+                                  op == OP_UNDELETE_THREAD ? 0 : 1);
         if (rc != -1)
         {
           rc = mutt_thread_set_flag(CUR_EMAIL, MUTT_PURGE, 0,
diff --git a/init.c b/init.c
index 7d2787971..0e88edebe 100644
--- a/init.c
+++ b/init.c
@@ -50,8 +50,8 @@
 #include "filter.h"
 #include "hcache/hcache.h"
 #include "keymap.h"
-#include "mutt_menu.h"
 #include "mutt_curses.h"
+#include "mutt_menu.h"
 #include "mutt_window.h"
 #include "mx.h"
 #include "myvar.h"
diff --git a/main.c b/main.c
index e63818e46..53cdb65b7 100644
--- a/main.c
+++ b/main.c
@@ -58,11 +58,11 @@
 #include "index.h"
 #include "keymap.h"
 #include "mailbox.h"
-#include "mutt_menu.h"
 #include "mutt_attach.h"
 #include "mutt_curses.h"
 #include "mutt_history.h"
 #include "mutt_logging.h"
+#include "mutt_menu.h"
 #include "mutt_window.h"
 #include "muttlib.h"
 #include "mx.h"
diff --git a/menu.c b/menu.c
index f4d35a989..bd2ae89a0 100644
--- a/menu.c
+++ b/menu.c
@@ -35,7 +35,6 @@
 #include "mutt/mutt.h"
 #include "email/lib.h"
 #include "mutt.h"
-#include "mutt_menu.h"
 #include "color.h"
 #include "commands.h"
 #include "context.h"
@@ -45,6 +44,7 @@
 #include "mailbox.h"
 #include "mutt_curses.h"
 #include "mutt_logging.h"
+#include "mutt_menu.h"
 #include "mutt_window.h"
 #include "muttlib.h"
 #include "opcodes.h"
diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c
index 3eb31f2d6..b105c5fcb 100644
--- a/ncrypt/crypt_gpgme.c
+++ b/ncrypt/crypt_gpgme.c
@@ -60,9 +60,9 @@
 #include "handler.h"
 #include "hook.h"
 #include "keymap.h"
-#include "mutt_menu.h"
 #include "mutt_attach.h"
 #include "mutt_logging.h"
+#include "mutt_menu.h"
 #include "mutt_window.h"
 #include "muttlib.h"
 #include "ncrypt.h"
diff --git a/ncrypt/pgpkey.c b/ncrypt/pgpkey.c
index ab916c8c2..1a9a6bf4c 100644
--- a/ncrypt/pgpkey.c
+++ b/ncrypt/pgpkey.c
@@ -49,8 +49,8 @@
 #include "globals.h"
 #include "gnupgparse.h"
 #include "keymap.h"
-#include "mutt_menu.h"
 #include "mutt_logging.h"
+#include "mutt_menu.h"
 #include "mutt_window.h"
 #include "muttlib.h"
 #include "ncrypt.h"
diff --git a/ncrypt/smime.c b/ncrypt/smime.c
index 23d6a38ea..144797ef7 100644
--- a/ncrypt/smime.c
+++ b/ncrypt/smime.c
@@ -50,9 +50,9 @@
 #include "globals.h"
 #include "handler.h"
 #include "keymap.h"
-#include "mutt_menu.h"
 #include "mutt_curses.h"
 #include "mutt_logging.h"
+#include "mutt_menu.h"
 #include "mutt_window.h"
 #include "muttlib.h"
 #include "ncrypt.h"
diff --git a/pager.c b/pager.c
index c427b0249..5046be3e3 100644
--- a/pager.c
+++ b/pager.c
@@ -55,11 +55,11 @@
 #include "index.h"
 #include "keymap.h"
 #include "mailbox.h"
-#include "mutt_menu.h"
 #include "mutt_attach.h"
 #include "mutt_curses.h"
 #include "mutt_header.h"
 #include "mutt_logging.h"
+#include "mutt_menu.h"
 #include "mutt_window.h"
 #include "muttlib.h"
 #include "mx.h"
diff --git a/pattern.c b/pattern.c
index 4d1c92de2..24c57a2a5 100644
--- a/pattern.c
+++ b/pattern.c
@@ -52,8 +52,8 @@
 #include "handler.h"
 #include "hdrline.h"
 #include "mailbox.h"
-#include "mutt_menu.h"
 #include "mutt_logging.h"
+#include "mutt_menu.h"
 #include "mutt_parse.h"
 #include "muttlib.h"
 #include "mx.h"
diff --git a/postpone.c b/postpone.c
index 5ba29507b..49d8bcd6d 100644
--- a/postpone.c
+++ b/postpone.c
@@ -47,8 +47,8 @@
 #include "hdrline.h"
 #include "keymap.h"
 #include "mailbox.h"
-#include "mutt_menu.h"
 #include "mutt_logging.h"
+#include "mutt_menu.h"
 #include "mutt_thread.h"
 #include "muttlib.h"
 #include "ncrypt/ncrypt.h"
diff --git a/query.c b/query.c
index 16bedd114..68143d5d5 100644
--- a/query.c
+++ b/query.c
@@ -41,8 +41,8 @@
 #include "format_flags.h"
 #include "globals.h"
 #include "keymap.h"
-#include "mutt_menu.h"
 #include "mutt_logging.h"
+#include "mutt_menu.h"
 #include "mutt_window.h"
 #include "muttlib.h"
 #include "opcodes.h"
diff --git a/recvattach.c b/recvattach.c
index d7aa9a4c6..5f8a4b2c8 100644
--- a/recvattach.c
+++ b/recvattach.c
@@ -50,9 +50,9 @@
 #include "hook.h"
 #include "keymap.h"
 #include "mailbox.h"
-#include "mutt_menu.h"
 #include "mutt_attach.h"
 #include "mutt_logging.h"
+#include "mutt_menu.h"
 #include "mutt_parse.h"
 #include "mutt_window.h"
 #include "muttlib.h"
diff --git a/remailer.c b/remailer.c
index df019d8e1..fd87c62c9 100644
--- a/remailer.c
+++ b/remailer.c
@@ -39,8 +39,8 @@
 #include "filter.h"
 #include "format_flags.h"
 #include "keymap.h"
-#include "mutt_menu.h"
 #include "mutt_curses.h"
+#include "mutt_menu.h"
 #include "mutt_window.h"
 #include "muttlib.h"
 #include "opcodes.h"
diff --git a/sidebar.c b/sidebar.c
index 721e2abf3..cf60d04f3 100644
--- a/sidebar.c
+++ b/sidebar.c
@@ -42,8 +42,8 @@
 #include "format_flags.h"
 #include "globals.h"
 #include "mailbox.h"
-#include "mutt_menu.h"
 #include "mutt_curses.h"
+#include "mutt_menu.h"
 #include "mutt_window.h"
 #include "muttlib.h"
 #include "mx.h"