From f5c7ab70ff7fbb2e19eac7797eafb4767cb2d23c Mon Sep 17 00:00:00 2001
From: Richard Russon <rich@flatcap.org>
Date: Tue, 10 Jul 2018 01:00:56 +0100
Subject: [PATCH] move hook flags

---
 hook.c |  1 +
 hook.h | 23 +++++++++++++++++++++++
 mutt.h | 23 -----------------------
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/hook.c b/hook.c
index bc8f37f62..7540e1420 100644
--- a/hook.c
+++ b/hook.c
@@ -36,6 +36,7 @@
 #include "mutt/mutt.h"
 #include "email/email.h"
 #include "mutt.h"
+#include "hook.h"
 #include "alias.h"
 #include "globals.h"
 #include "hdrline.h"
diff --git a/hook.h b/hook.h
index 97845db95..d6e616be9 100644
--- a/hook.h
+++ b/hook.h
@@ -37,6 +37,29 @@ extern char *DefaultHook;
 extern bool  ForceName;
 extern bool  SaveName;
 
+/* types for mutt_parse_hook() */
+#define MUTT_FOLDERHOOK   (1 << 0)
+#define MUTT_MBOXHOOK     (1 << 1)
+#define MUTT_SENDHOOK     (1 << 2)
+#define MUTT_FCCHOOK      (1 << 3)
+#define MUTT_SAVEHOOK     (1 << 4)
+#define MUTT_CHARSETHOOK  (1 << 5)
+#define MUTT_ICONVHOOK    (1 << 6)
+#define MUTT_MESSAGEHOOK  (1 << 7)
+#define MUTT_CRYPTHOOK    (1 << 8)
+#define MUTT_ACCOUNTHOOK  (1 << 9)
+#define MUTT_REPLYHOOK    (1 << 10)
+#define MUTT_SEND2HOOK    (1 << 11)
+#ifdef USE_COMPRESSED
+#define MUTT_OPENHOOK     (1 << 12)
+#define MUTT_APPENDHOOK   (1 << 13)
+#define MUTT_CLOSEHOOK    (1 << 14)
+#endif
+#define MUTT_TIMEOUTHOOK  (1 << 15)
+#define MUTT_STARTUPHOOK  (1 << 16)
+#define MUTT_SHUTDOWNHOOK (1 << 17)
+#define MUTT_GLOBALHOOK   (1 << 18)
+
 void  mutt_account_hook(const char *url);
 void  mutt_crypt_hook(struct ListHead *list, struct Address *addr);
 void  mutt_default_save(char *path, size_t pathlen, struct Header *hdr);
diff --git a/mutt.h b/mutt.h
index fda61329b..70e7d4855 100644
--- a/mutt.h
+++ b/mutt.h
@@ -80,29 +80,6 @@ struct Mapping;
 #define MUTT_TOKEN_BACKTICK_VARS (1<<7)  /**< expand variables within backticks */
 #define MUTT_TOKEN_NOSHELL       (1<<8)  /**< don't expand environment variables */
 
-/* types for mutt_add_hook() */
-#define MUTT_FOLDERHOOK   (1 << 0)
-#define MUTT_MBOXHOOK     (1 << 1)
-#define MUTT_SENDHOOK     (1 << 2)
-#define MUTT_FCCHOOK      (1 << 3)
-#define MUTT_SAVEHOOK     (1 << 4)
-#define MUTT_CHARSETHOOK  (1 << 5)
-#define MUTT_ICONVHOOK    (1 << 6)
-#define MUTT_MESSAGEHOOK  (1 << 7)
-#define MUTT_CRYPTHOOK    (1 << 8)
-#define MUTT_ACCOUNTHOOK  (1 << 9)
-#define MUTT_REPLYHOOK    (1 << 10)
-#define MUTT_SEND2HOOK    (1 << 11)
-#ifdef USE_COMPRESSED
-#define MUTT_OPENHOOK     (1 << 12)
-#define MUTT_APPENDHOOK   (1 << 13)
-#define MUTT_CLOSEHOOK    (1 << 14)
-#endif
-#define MUTT_TIMEOUTHOOK  (1 << 15)
-#define MUTT_STARTUPHOOK  (1 << 16)
-#define MUTT_SHUTDOWNHOOK (1 << 17)
-#define MUTT_GLOBALHOOK   (1 << 18)
-
 /* tree characters for linearize_tree and print_enriched_string */
 #define MUTT_TREE_LLCORNER 1
 #define MUTT_TREE_ULCORNER 2
-- 
2.40.0