more hash code simplifications.

[apps/madmutt.git] / mutt.h

diff --git a/mutt.h b/mutt.h
index ae133c9..4758623 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -13,6 +13,7 @@
 
 #include <lib-lib/lib-lib.h>
 #include <lib-mime/mime.h>
+#include <lib-lua/lib-lua.h>
 
 #define MUTT_VERSION (VERSION)
 
@@ -30,17 +31,6 @@ typedef struct {
   int op;                       /* function op */
 } event_t;
 
-/* flags for m_strformat() */
-typedef enum {
-  M_FORMAT_FORCESUBJ   = (1 << 0),  /* print the subject even if unchanged */
-  M_FORMAT_TREE        = (1 << 1),  /* draw the thread tree */
-  M_FORMAT_MAKEPRINT   = (1 << 2),  /* make sure that all chars are printable */
-  M_FORMAT_OPTIONAL    = (1 << 3),
-  M_FORMAT_STAT_FILE   = (1 << 4),  /* used by mutt_attach_fmt */
-  M_FORMAT_ARROWCURSOR = (1 << 5),  /* reserve space for arrow_cursor */
-  M_FORMAT_INDEX       = (1 << 6)   /* this is a main index entry */
-} format_flag;
-
 /* types for mutt_add_hook() */
 #define M_FOLDERHOOK   1
 #define M_MBOXHOOK     (1<<1)
@@ -164,14 +154,6 @@ enum {
   M_SAVE_OVERWRITE
 };
 
-/* possible arguments to set_quadoption() */
-enum {
-  M_NO,
-  M_YES,
-  M_ASKNO,
-  M_ASKYES
-};
-
 /* quad-option vars */
 enum {
   OPT_ABORT,
@@ -191,7 +173,6 @@ enum {
   OPT_POPRECONNECT,
   OPT_POSTPONE,
   OPT_PRINT,
-  OPT_QUIT,
   OPT_REPLYTO,
   OPT_RECALL,
 #if defined(USE_SSL) || defined(USE_GNUTLS)
@@ -458,8 +439,6 @@ enum {
 #define toggle_option(x) mutt_bit_toggle(Options,x)
 #define option(x) mutt_bit_isset(Options,x)
 
-int mutt_matches_ignore (const char *, string_list_t *);
-
 void mutt_init (int, string_list_t *);
 
 typedef struct thread {
@@ -494,9 +473,9 @@ typedef struct {
   HEADER **hdrs;
   HEADER *last_tag;             /* last tagged msg. used to link threads */
   THREAD *tree;                 /* top of thread tree */
-  HASH *id_hash;                /* hash table by msg id */
-  HASH *subj_hash;              /* hash table by subject */
-  HASH *thread_hash;            /* hash table for threading */
+  hash_t *id_hash;                /* hash table by msg id */
+  hash_t *subj_hash;              /* hash table by subject */
+  hash_t *thread_hash;            /* hash table for threading */
   int *v2r;                     /* mapping from virtual to real msgno */
   int hdrmax;                   /* number of pointers in hdrs */
   int msgcount;                 /* number of messages in the mailbox */