void set_quadoption (int, int);
int query_quadoption (int, const char *);
+int query_quadoption2(int, const char *);
int quadoption (int);
int mutt_option_value (const char* val, char* dst, ssize_t dstlen);
const char *mutt_charset_hook (const char *);
const char *mutt_iconv_hook (const char *);
-ssize_t _mutt_expand_path (char *, ssize_t, int);
-#define mutt_expand_path(s, n) _mutt_expand_path((s), (n), 0)
+ssize_t _mutt_expand_path(char *, ssize_t, const char *, int);
+#define mutt_expand_path(s, n) _mutt_expand_path((s), (n), (s), 0)
char *mutt_find_hook (int, const char *);
char *mutt_get_body_charset (char *, ssize_t, BODY *);
const char *mutt_crypt_hook (address_t *);
char *mutt_make_date (char *, ssize_t);
-const char *mutt_make_version (int full);
+const char *mutt_make_version(void);
const char *mutt_fqdn (short);
string_list_t *** pp, string_list_t *** qq);
int mutt_bounce_message (FILE * fp, HEADER *, address_t *);
void mutt_check_rescore (CONTEXT *);
-void mutt_default_save (char *, ssize_t, const HEADER *);
+void mutt_default_save (char *, ssize_t, HEADER *);
void mutt_display_address (ENVELOPE *);
void mutt_edit_content_type (HEADER *, BODY *, FILE *);
-void mutt_edit_headers (const char *, const char *, HEADER *, char *, ssize_t);
+void mutt_edit_headers(const char *, HEADER *, char *, ssize_t);
void mutt_enter_command (void);
void mutt_fix_reply_recipients (ENVELOPE * env);
void mutt_folder_hook (char *);
int mutt_parse_hook (BUFFER *, BUFFER *, unsigned long, BUFFER *);
int mutt_parse_macro (BUFFER *, BUFFER *, unsigned long, BUFFER *);
int mutt_parse_push (BUFFER *, BUFFER *, unsigned long, BUFFER *);
-int mutt_parse_rc_line ( /* const */ char *, BUFFER *, BUFFER *);
+int mutt_parse_rc_line (const char *, BUFFER *, BUFFER *);
int mutt_parse_score (BUFFER *, BUFFER *, unsigned long, BUFFER *);
int mutt_parse_unscore (BUFFER *, BUFFER *, unsigned long, BUFFER *);
int mutt_parse_unhook (BUFFER *, BUFFER *, unsigned long, BUFFER *);
int ci_send_message (int, HEADER *, char *, CONTEXT *, HEADER *);
/* flags for mutt_extract_token() */
-#define M_TOKEN_EQUAL 1 /* treat '=' as a special */
-#define M_TOKEN_CONDENSE (1<<1) /* ^(char) to control chars (macros) */
-#define M_TOKEN_SPACE (1<<2) /* don't treat whitespace as a term */
-#define M_TOKEN_QUOTE (1<<3) /* don't interpret quotes */
-#define M_TOKEN_PATTERN (1<<4) /* !)|~ are terms (for patterns) */
-#define M_TOKEN_COMMENT (1<<5) /* don't reap comments */
-#define M_TOKEN_SEMICOLON (1<<6) /* don't treat ; as special */
+#define M_TOKEN_EQUAL (1 << 0) /* treat '=' as a special */
+#define M_TOKEN_CONDENSE (1 << 1) /* ^(char) to control chars (macros) */
+#define M_TOKEN_SPACE (1 << 2) /* don't treat whitespace as a term */
+#define M_TOKEN_PATTERN (1 << 3) /* !)|~ are terms (for patterns) */
+/* equivalent to M_TOKEN_PATTERN */
+#define M_TOKEN_COMMENT (1 << 4) /* don't reap comments */
+
+/* implies M_TOKEN_SPACE */
+#define M_TOKEN_QUOTE (1 << 5) /* don't interpret quotes */
int mutt_extract_token(BUFFER *, BUFFER *, int);