sort #includes

Put "*/lib.h" (library headers) before "*.h" (neomutt headers).
igor47 · Aug 6, 2020 · 6682a8d · 6682a8d
1 parent b94578c
commit 6682a8d
Show file tree

Hide file tree

Showing 88 changed files with 138 additions and 138 deletions.
diff --git a/.clang-format b/.clang-format
@@ -54,11 +54,11 @@ IncludeCategories:
 
   # All backend library headers
   - Regex:      '".*/lib\.h"'
-    Priority:   10
+    Priority:   5
 
   # All other NeoMutt headers
   - Regex:      '".*"'
-    Priority:   5
+    Priority:   10
 
 AlignAfterOpenBracket:            true
 AlignEscapedNewlinesLeft:         false

diff --git a/alias/alias.c b/alias/alias.c
@@ -46,11 +46,11 @@
 #include "mutt.h"
 #include "alias.h"
 #include "lib.h"
+#include "send/lib.h"
 #include "maillist.h"
 #include "mutt_globals.h"
 #include "muttlib.h"
 #include "reverse.h"
-#include "send/lib.h"
 
 struct AliasList Aliases = TAILQ_HEAD_INITIALIZER(Aliases); ///< List of all the user's email aliases
 

diff --git a/alias/dlgquery.c b/alias/dlgquery.c
@@ -40,6 +40,7 @@
 #include "gui/lib.h"
 #include "mutt.h"
 #include "lib.h"
+#include "send/lib.h"
 #include "alias.h"
 #include "format_flags.h"
 #include "gui.h"
@@ -49,7 +50,6 @@
 #include "mutt_menu.h"
 #include "muttlib.h"
 #include "opcodes.h"
-#include "send/lib.h"
 
 /* These Config Variables are only used in dlgquery.c */
 char *C_QueryCommand; ///< Config: External command to query and external address book

diff --git a/alias/lib.h b/alias/lib.h
@@ -38,8 +38,8 @@
 #ifndef MUTT_ALIAS_LIB_H
 #define MUTT_ALIAS_LIB_H
 
-#include <stdbool.h>
 #include <stddef.h>
+#include <stdbool.h>
 #include <stdint.h>
 #include "mutt_commands.h"
 

diff --git a/autocrypt/autocrypt.c b/autocrypt/autocrypt.c
@@ -38,14 +38,14 @@
 #include "config/lib.h"
 #include "email/lib.h"
 #include "gui/lib.h"
-#include "mutt_globals.h"
-#include "muttlib.h"
-#include "mx.h"
-#include "options.h"
 #include "autocrypt/lib.h"
 #include "hcache/lib.h"
 #include "ncrypt/lib.h"
 #include "send/lib.h"
+#include "mutt_globals.h"
+#include "muttlib.h"
+#include "mx.h"
+#include "options.h"
 
 /**
  * autocrypt_dir_init - Initialise an Autocrypt directory

diff --git a/autocrypt/dlgautocrypt.c b/autocrypt/dlgautocrypt.c
@@ -36,13 +36,13 @@
 #include "config/lib.h"
 #include "gui/lib.h"
 #include "mutt.h"
+#include "autocrypt/lib.h"
 #include "format_flags.h"
 #include "keymap.h"
 #include "mutt_globals.h"
 #include "mutt_menu.h"
 #include "muttlib.h"
 #include "opcodes.h"
-#include "autocrypt/lib.h"
 
 /**
  * struct AccountEntry - An entry in the Autocrypt account Menu

diff --git a/autocrypt/gpgme.c b/autocrypt/gpgme.c
@@ -36,8 +36,8 @@
 #include "config/lib.h"
 #include "gui/lib.h"
 #include "lib.h"
-#include "options.h"
 #include "ncrypt/lib.h"
+#include "options.h"
 
 /**
  * create_gpgme_context - Create a GPGME context

diff --git a/bcache/bcache.c b/bcache/bcache.c
@@ -37,9 +37,9 @@
 #include <unistd.h>
 #include "mutt/lib.h"
 #include "email/lib.h"
+#include "bcache/lib.h"
 #include "mutt_account.h"
 #include "muttlib.h"
-#include "bcache/lib.h"
 
 struct ConnAccount;
 

diff --git a/browser.c b/browser.c
@@ -46,6 +46,7 @@
 #include "gui/lib.h"
 #include "mutt.h"
 #include "browser.h"
+#include "send/lib.h"
 #include "context.h"
 #include "format_flags.h"
 #include "keymap.h"
@@ -57,7 +58,6 @@
 #include "mx.h"
 #include "opcodes.h"
 #include "options.h"
-#include "send/lib.h"
 #ifdef USE_IMAP
 #include "imap/lib.h"
 #endif

diff --git a/command_parse.c b/command_parse.c
@@ -43,6 +43,7 @@
 #include "gui/lib.h"
 #include "mutt.h"
 #include "command_parse.h"
+#include "imap/lib.h"
 #include "context.h"
 #include "init.h"
 #include "keymap.h"
@@ -57,7 +58,6 @@
 #include "myvar.h"
 #include "options.h"
 #include "version.h"
-#include "imap/lib.h"
 #ifdef USE_SIDEBAR
 #include "sidebar/lib.h"
 #endif

diff --git a/commands.c b/commands.c
@@ -45,6 +45,8 @@
 #include "gui/lib.h"
 #include "mutt.h"
 #include "commands.h"
+#include "ncrypt/lib.h"
+#include "send/lib.h"
 #include "context.h"
 #include "copy.h"
 #include "format_flags.h"
@@ -66,8 +68,6 @@
 #include "progress.h"
 #include "protos.h"
 #include "sort.h"
-#include "ncrypt/lib.h"
-#include "send/lib.h"
 #ifdef USE_IMAP
 #include "imap/lib.h"
 #endif

diff --git a/compose.c b/compose.c
@@ -47,6 +47,8 @@
 #include "gui/lib.h"
 #include "mutt.h"
 #include "compose.h"
+#include "ncrypt/lib.h"
+#include "send/lib.h"
 #include "browser.h"
 #include "commands.h"
 #include "context.h"
@@ -68,8 +70,6 @@
 #include "recvattach.h"
 #include "rfc3676.h"
 #include "sort.h"
-#include "ncrypt/lib.h"
-#include "send/lib.h"
 #ifdef ENABLE_NLS
 #include <libintl.h>
 #endif

diff --git a/context.c b/context.c
@@ -32,16 +32,16 @@
 #include "email/lib.h"
 #include "core/lib.h"
 #include "context.h"
+#include "imap/lib.h"
+#include "maildir/lib.h"
+#include "ncrypt/lib.h"
+#include "pattern/lib.h"
 #include "mutt_globals.h"
 #include "mutt_header.h"
 #include "mutt_thread.h"
 #include "mx.h"
 #include "score.h"
 #include "sort.h"
-#include "imap/lib.h"
-#include "maildir/lib.h"
-#include "ncrypt/lib.h"
-#include "pattern/lib.h"
 
 /**
  * ctx_free - Free a Context

diff --git a/copy.c b/copy.c
@@ -39,17 +39,17 @@
 #include "gui/lib.h"
 #include "mutt.h"
 #include "copy.h"
+#include "ncrypt/lib.h"
+#include "send/lib.h"
 #include "context.h"
 #include "handler.h"
 #include "hdrline.h"
 #include "mutt_globals.h"
 #include "mx.h"
 #include "state.h"
-#include "ncrypt/lib.h"
-#include "send/lib.h"
 #ifdef USE_NOTMUCH
-#include "muttlib.h"
 #include "notmuch/lib.h"
+#include "muttlib.h"
 #endif
 #ifdef ENABLE_NLS
 #include <libintl.h>

diff --git a/debug/graphviz.c b/debug/graphviz.c
@@ -36,17 +36,17 @@
 #include "core/lib.h"
 #include "conn/lib.h"
 #include "lib.h"
+#include "compmbox/lib.h"
+#include "maildir/lib.h"
+#include "mbox/lib.h"
+#include "nntp/lib.h"
+#include "notmuch/lib.h"
 #include "context.h"
 #include "imap/private.h"
 #include "maildir/private.h"
 #include "mutt_globals.h"
 #include "notmuch/private.h"
 #include "pop/private.h"
-#include "compmbox/lib.h"
-#include "maildir/lib.h"
-#include "mbox/lib.h"
-#include "nntp/lib.h"
-#include "notmuch/lib.h"
 
 // #define GV_HIDE_CONTEXT
 #define GV_HIDE_CONTEXT_CONTENTS

diff --git a/email/email.h b/email/email.h
@@ -28,8 +28,8 @@
 #include <stdbool.h>
 #include <time.h>
 #include "mutt/lib.h"
-#include "tags.h"
 #include "ncrypt/lib.h"
+#include "tags.h"
 
 /**
  * struct Email - The envelope/body of an email

diff --git a/enter.c b/enter.c
@@ -37,6 +37,8 @@
 #include "alias/lib.h"
 #include "gui/lib.h"
 #include "mutt.h"
+#include "history/lib.h"
+#include "pattern/lib.h"
 #include "browser.h"
 #include "context.h"
 #include "enter_state.h"
@@ -48,8 +50,6 @@
 #include "muttlib.h"
 #include "opcodes.h"
 #include "protos.h"
-#include "history/lib.h"
-#include "pattern/lib.h"
 
 /**
  * enum EnterRedrawFlags - redraw flags for mutt_enter_string_full()

diff --git a/gui/color.c b/gui/color.c
@@ -36,13 +36,13 @@
 #include "core/lib.h"
 #include "mutt.h"
 #include "color.h"
+#include "pattern/lib.h"
 #include "context.h"
 #include "init.h"
 #include "mutt_commands.h"
 #include "mutt_curses.h"
 #include "mutt_globals.h"
 #include "options.h"
-#include "pattern/lib.h"
 #ifdef USE_SLANG_CURSES
 #include <assert.h>
 #endif

diff --git a/gui/mutt_window.c b/gui/mutt_window.c
@@ -34,13 +34,13 @@
 #include "core/lib.h"
 #include "debug/lib.h"
 #include "mutt_window.h"
+#include "helpbar/lib.h"
 #include "mutt_curses.h"
 #include "mutt_globals.h"
 #include "mutt_menu.h"
 #include "opcodes.h"
 #include "options.h"
 #include "reflow.h"
-#include "helpbar/lib.h"
 
 struct MuttWindow *RootWindow = NULL;       ///< Parent of all Windows
 struct MuttWindow *AllDialogsWindow = NULL; ///< Parent of all Dialogs

diff --git a/handler.c b/handler.c
@@ -43,6 +43,7 @@
 #include "core/lib.h"
 #include "mutt.h"
 #include "handler.h"
+#include "ncrypt/lib.h"
 #include "copy.h"
 #include "enriched.h"
 #include "keymap.h"
@@ -56,7 +57,6 @@
 #include "pager.h"
 #include "rfc3676.h"
 #include "state.h"
-#include "ncrypt/lib.h"
 #ifdef ENABLE_NLS
 #include <libintl.h>
 #endif

diff --git a/hcache/hcache.c b/hcache/hcache.c
@@ -46,11 +46,11 @@
 #include "mutt/lib.h"
 #include "email/lib.h"
 #include "lib.h"
+#include "compress/lib.h"
+#include "store/lib.h"
 #include "hcache/hcversion.h"
 #include "muttlib.h"
 #include "serialize.h"
-#include "compress/lib.h"
-#include "store/lib.h"
 
 #if !(defined(HAVE_BDB) || defined(HAVE_GDBM) || defined(HAVE_KC) ||           \
       defined(HAVE_LMDB) || defined(HAVE_QDBM) || defined(HAVE_ROCKSDB) ||     \

diff --git a/hdrline.c b/hdrline.c
@@ -45,6 +45,7 @@
 #include "alias/lib.h"
 #include "gui/lib.h"
 #include "hdrline.h"
+#include "ncrypt/lib.h"
 #include "context.h"
 #include "format_flags.h"
 #include "hook.h"
@@ -55,7 +56,6 @@
 #include "mutt_thread.h"
 #include "muttlib.h"
 #include "sort.h"
-#include "ncrypt/lib.h"
 
 /* These Config Variables are only used in hdrline.c */
 struct MbTable *C_CryptChars; ///< Config: User-configurable crypto flags: signed, encrypted etc.

diff --git a/history/dlghistory.c b/history/dlghistory.c
@@ -33,12 +33,12 @@
 #include "mutt/lib.h"
 #include "gui/lib.h"
 #include "mutt.h"
+#include "history/lib.h"
 #include "format_flags.h"
 #include "keymap.h"
 #include "mutt_menu.h"
 #include "muttlib.h"
 #include "opcodes.h"
-#include "history/lib.h"
 
 /// Help Bar for the History Selection dialog
 static const struct Mapping HistoryHelp[] = {

diff --git a/hook.c b/hook.c
@@ -39,6 +39,8 @@
 #include "alias/lib.h"
 #include "mutt.h"
 #include "hook.h"
+#include "ncrypt/lib.h"
+#include "pattern/lib.h"
 #include "context.h"
 #include "format_flags.h"
 #include "hdrline.h"
@@ -48,8 +50,6 @@
 #include "mutt_globals.h"
 #include "muttlib.h"
 #include "mx.h"
-#include "ncrypt/lib.h"
-#include "pattern/lib.h"
 #ifdef USE_COMP_MBOX
 #include "compmbox/lib.h"
 #endif

diff --git a/imap/browse.c b/imap/browse.c
@@ -39,11 +39,11 @@
 #include "conn/lib.h"
 #include "gui/lib.h"
 #include "mutt.h"
+#include "imap/lib.h"
 #include "browser.h"
 #include "mutt_globals.h"
 #include "mutt_logging.h"
 #include "muttlib.h"
-#include "imap/lib.h"
 
 /**
  * add_folder - Format and add an IMAP folder to the browser