Commit 7c0b5980 authored by Thomas Roessler's avatar Thomas Roessler

Merging changes from stable.

parent d02b2498
......@@ -243,7 +243,7 @@ fi
if test $mutt_cv_regex = yes; then
AC_DEFINE(USE_GNU_REGEX)
LIBOBJS="$LIBOBJS regex.c"
LIBOBJS="$LIBOBJS regex.o"
fi
......
......@@ -147,7 +147,7 @@ struct option_t MuttVars[] = {
{ "menu_scroll", DT_BOOL, R_NONE, OPTMENUSCROLL, 0 },
{ "meta_key", DT_BOOL, R_NONE, OPTMETAKEY, 0 },
{ "mh_purge", DT_BOOL, R_NONE, OPTMHPURGE, 0 },
{ "mime_forward", DT_QUAD, R_NONE, OPT_MIMEFWD, 0 },
{ "mime_forward", DT_QUAD, R_NONE, OPT_MIMEFWD, M_NO },
{ "mime_forward_decode", DT_BOOL, R_NONE, OPTMIMEFORWDECODE, 0 },
{ "mime_fwd", DT_SYN, R_NONE, UL "mime_forward", 0 },
{ "move", DT_QUAD, R_NONE, OPT_MOVE, M_ASKNO },
......@@ -269,7 +269,7 @@ struct option_t MuttVars[] = {
{ "use_8bitmime", DT_BOOL, R_NONE, OPTUSE8BITMIME, 0 },
{ "use_domain", DT_BOOL, R_NONE, OPTUSEDOMAIN, 1 },
{ "use_from", DT_BOOL, R_NONE, OPTUSEFROM, 1 },
{ "use_mailcap", DT_QUAD, R_NONE, OPT_USEMAILCAP, 1 },
{ "use_mailcap", DT_QUAD, R_NONE, OPT_USEMAILCAP, M_ASKNO },
{ "visual", DT_PATH, R_NONE, UL &Visual, 0 },
{ "wait_key", DT_BOOL, R_NONE, OPTWAITKEY, 1 },
{ "wrap_search", DT_BOOL, R_NONE, OPTWRAPSEARCH, 1 },
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment