From: Pierre Habouzit <madcoder@debian.org>
Date: Wed, 15 Aug 2007 09:33:13 +0000 (+0200)
Subject: Always resort, redraw, ... whatever when we change settings.
X-Git-Url: http://git.madism.org/?a=commitdiff_plain;h=6c248aa3490f9c948da1bcfe49bdf8d7ba25e372;p=apps%2Fmadmutt.git

Always resort, redraw, ... whatever when we change settings.

  It's almost instantaneous, don't complicate the code for that.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
---

diff --git a/init.c b/init.c
index 04f45e8..7106e97 100644
--- a/init.c
+++ b/init.c
@@ -941,18 +941,12 @@ static void mutt_restore_default (const char* name __attribute__ ((unused)),
     p_delete(&init);
   }
 
-  if (ptr->flags & R_INDEX)
-    set_option (OPTFORCEREDRAWINDEX);
-  if (ptr->flags & R_PAGER)
-    set_option (OPTFORCEREDRAWPAGER);
-  if (ptr->flags & R_RESORT_SUB)
-    set_option (OPTSORTSUBTHREADS);
-  if (ptr->flags & R_RESORT)
-    set_option (OPTNEEDRESORT);
-  if (ptr->flags & R_RESORT_INIT)
-    set_option (OPTRESORTINIT);
-  if (ptr->flags & R_TREE)
-    set_option (OPTREDRAWTREE);
+  set_option (OPTFORCEREDRAWINDEX);
+  set_option (OPTFORCEREDRAWPAGER);
+  set_option (OPTSORTSUBTHREADS);
+  set_option (OPTNEEDRESORT);
+  set_option (OPTRESORTINIT);
+  set_option (OPTREDRAWTREE);
 }
 
 static int check_num (const char* option, unsigned long p,
@@ -1009,15 +1003,6 @@ static const struct mapping_t* get_sortmap (struct option_t* option) {
   return (map);
 }
 
-#define CHECK_PAGER \
-  if ((CurrentMenu == MENU_PAGER) && \
-      (!option || (option->flags & R_RESORT))) \
-  { \
-    snprintf (err->data, err->dsize, \
-              _("Not available in this menu.")); \
-    return (-1); \
-  }
-
 static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
                       BUFFER * err)
 {
@@ -1082,7 +1067,6 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
         set_option (OPTREDRAWTREE);
         return (0);
       } else {
-        CHECK_PAGER;
         mutt_restore_default (NULL, option, 1);
       }
     }
@@ -1112,7 +1096,6 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
         return 0;
       }
 
-      CHECK_PAGER;
       if (unset)
         unset_option (option->data);
       else if (inv)
@@ -1130,7 +1113,6 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
       /* XXX maybe we need to get unset into handlers? */
       if (DTYPE (option->type) == DT_STR || DTYPE (option->type) == DT_PATH) {
         if (unset) {
-          CHECK_PAGER;
           p_delete((void **)(void *)&option->data);
           break;
         }
@@ -1142,7 +1124,6 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
         break;
       }
 
-      CHECK_PAGER;
       s->dptr++;
       mutt_extract_token (tmp, s, 0);
       if (!FuncTable[DTYPE (option->type)].opt_fromstr
@@ -1157,7 +1138,6 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
       }
 
       if (*s->dptr == '=') {
-        CHECK_PAGER;
         s->dptr++;
         mutt_extract_token (tmp, s, 0);
         if (ascii_strcasecmp ("yes", tmp->data) == 0)
@@ -1191,18 +1171,12 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
       break;
     }
 
-    if (option->flags & R_INDEX)
-      set_option (OPTFORCEREDRAWINDEX);
-    if (option->flags & R_PAGER)
-      set_option (OPTFORCEREDRAWPAGER);
-    if (option->flags & R_RESORT_SUB)
-      set_option (OPTSORTSUBTHREADS);
-    if (option->flags & R_RESORT)
-      set_option (OPTNEEDRESORT);
-    if (option->flags & R_RESORT_INIT)
-      set_option (OPTRESORTINIT);
-    if (option->flags & R_TREE)
-      set_option (OPTREDRAWTREE);
+    set_option (OPTFORCEREDRAWINDEX);
+    set_option (OPTFORCEREDRAWPAGER);
+    set_option (OPTSORTSUBTHREADS);
+    set_option (OPTNEEDRESORT);
+    set_option (OPTRESORTINIT);
+    set_option (OPTREDRAWTREE);
   }
   return (r);
 }
diff --git a/init.h b/init.h
index 1bbea8f..2ccc464 100644
--- a/init.h
+++ b/init.h
@@ -39,23 +39,9 @@
 #define M_SET_UNSET     (1<<1)  /* default is to unset all vars */
 #define M_SET_RESET     (1<<2)  /* default is to reset all vars to default */
 
-/* forced redraw/resort types */
-#define R_NONE          0
-#define R_INDEX         (1<<0)
-#define R_PAGER         (1<<1)
-#define R_BOTH          (R_INDEX|R_PAGER)
-
-/* TODO:MC: will go in the the thread module */
-#define R_RESORT        (1<<2)  /* resort the mailbox */
-#define R_RESORT_SUB    (1<<3)  /* resort subthreads */
-#define R_RESORT_INIT   (1<<4)  /* resort from scratch */
-#define R_TREE          (1<<5)  /* redraw the thread tree */
-#define R_RESORT_BOTH   (R_RESORT|R_RESORT_SUB)
-
 struct option_t {
   const char *option;
   short type;
-  short flags;
   unsigned long data;
   const char *init;
 };
@@ -68,7 +54,7 @@ struct option_t {
 
 struct option_t MuttVars[] = {
   /*++*/
-  {"abort_noattach", DT_QUAD, R_NONE, OPT_ATTACH, "no" },
+  {"abort_noattach", DT_QUAD, OPT_ATTACH, "no" },
   /*
    ** .pp
    ** This variable specifies whether to abort sending if no attachment
@@ -86,7 +72,7 @@ struct option_t MuttVars[] = {
    ** .pp
    ** See also the $$attach_remind_regexp variable.
    */
-  {"abort_nosubject", DT_QUAD, R_NONE, OPT_SUBJECT, "ask-yes" },
+  {"abort_nosubject", DT_QUAD, OPT_SUBJECT, "ask-yes" },
   /*
    ** .pp
    ** If set to \fIyes\fP, when composing messages and no subject is given
@@ -94,7 +80,7 @@ struct option_t MuttVars[] = {
    ** \fIno\fP, composing messages with no subject given at the subject
    ** prompt will never be aborted.
    */
-  {"abort_unmodified", DT_QUAD, R_NONE, OPT_ABORT, "yes" },
+  {"abort_unmodified", DT_QUAD, OPT_ABORT, "yes" },
   /*
    ** .pp
    ** If set to \fIyes\fP, composition will automatically abort after
@@ -102,25 +88,25 @@ struct option_t MuttVars[] = {
    ** check only happens after the \fIfirst\fP edit of the file).  When set
    ** to \fIno\fP, composition will never be aborted.
    */
-  {"allow_8bit", DT_BOOL, R_NONE, OPTALLOW8BIT, "yes" },
+  {"allow_8bit", DT_BOOL, OPTALLOW8BIT, "yes" },
   /*
    ** .pp
    ** Controls whether 8-bit data is converted to 7-bit using either
    ** \fTquoted-printable\fP or \fTbase64\fP encoding when sending mail.
    */
-  {"askbcc", DT_BOOL, R_NONE, OPTASKBCC, "no" },
+  {"askbcc", DT_BOOL, OPTASKBCC, "no" },
   /*
    ** .pp
    ** If \fIset\fP, Madmutt will prompt you for blind-carbon-copy (Bcc) recipients
    ** before editing an outgoing message.
    */
-  {"askcc", DT_BOOL, R_NONE, OPTASKCC, "no" },
+  {"askcc", DT_BOOL, OPTASKCC, "no" },
   /*
    ** .pp
    ** If \fIset\fP, Madmutt will prompt you for carbon-copy (Cc) recipients before
    ** editing the body of an outgoing message.
    */
-  {"attach_format", DT_STR, R_NONE, UL &AttachFormat, "%u%D%I %t%4n %T%.40d%> [%.7m/%.10M, %.6e%?C?, %C?, %s] "},
+  {"attach_format", DT_STR, UL &AttachFormat, "%u%D%I %t%4n %T%.40d%> [%.7m/%.10M, %.6e%?C?, %C?, %s] "},
   /*
    ** .pp
    ** This variable describes the format of the ``attachment'' menu.  The
@@ -147,7 +133,7 @@ struct option_t MuttVars[] = {
    ** .dt %|X .dd pad to the end of the line with character "X"
    ** .de
    */
-  {"attach_remind_regexp", DT_RX, R_NONE, UL &AttachRemindRegexp, "attach"},
+  {"attach_remind_regexp", DT_RX, UL &AttachRemindRegexp, "attach"},
   /*
    ** .pp
    ** If this variable is non-empty, madmutt will scan a message's contents
@@ -157,13 +143,13 @@ struct option_t MuttVars[] = {
    ** This variable and $$abort_noattach are intended to remind the user
    ** to attach files if the message's text references them.
    */
-  {"attach_sep", DT_STR, R_NONE, UL &AttachSep, "\n"},
+  {"attach_sep", DT_STR, UL &AttachSep, "\n"},
   /*
    ** .pp
    ** The separator to add between attachments when operating (saving,
    ** printing, piping, etc) on a list of tagged attachments.
    */
-  {"attach_split", DT_BOOL, R_NONE, OPTATTACHSPLIT, "yes" },
+  {"attach_split", DT_BOOL, OPTATTACHSPLIT, "yes" },
   /*
    ** .pp
    ** If this variable is \fIunset\fP, when operating (saving, printing, piping,
@@ -172,14 +158,14 @@ struct option_t MuttVars[] = {
    ** ``$$attach_sep'' separator is added after each attachment. When \fIset\fP,
    ** Madmutt will operate on the attachments one by one.
    */
-  {"attribution", DT_STR, R_NONE, UL &Attribution, "On %d, %n wrote:"},
+  {"attribution", DT_STR, UL &Attribution, "On %d, %n wrote:"},
   /*
    ** .pp
    ** This is the string that will precede a message which has been included
    ** in a reply.  For a full listing of defined \fTprintf(3)\fP-like sequences see
    ** the section on ``$$index_format''.
    */
-  {"autoedit", DT_BOOL, R_NONE, OPTAUTOEDIT, "no" },
+  {"autoedit", DT_BOOL, OPTAUTOEDIT, "no" },
   /*
    ** .pp
    ** When \fIset\fP along with ``$$edit_headers'', Madmutt will skip the initial
@@ -189,7 +175,7 @@ struct option_t MuttVars[] = {
    ** .pp
    ** Also see ``$$fast_reply''.
    */
-  {"auto_tag", DT_BOOL, R_NONE, OPTAUTOTAG, "no" },
+  {"auto_tag", DT_BOOL, OPTAUTOTAG, "no" },
   /*
    ** .pp
    ** When \fIset\fP, functions in the \fIindex\fP menu which affect a message
@@ -197,7 +183,7 @@ struct option_t MuttVars[] = {
    ** unset, you must first use the ``tag-prefix'' function (default: "\fT;\fP") to
    ** make the next function apply to all tagged messages.
    */
-  {"bounce", DT_QUAD, R_NONE, OPT_BOUNCE, "ask-yes" },
+  {"bounce", DT_QUAD, OPT_BOUNCE, "ask-yes" },
   /*
    ** .pp
    ** Controls whether you will be asked to confirm bouncing messages.
@@ -205,14 +191,14 @@ struct option_t MuttVars[] = {
    ** message. Setting this variable to \fIno\fP is not generally useful,
    ** and thus not recommended, because you are unable to bounce messages.
    */
-  {"bounce_delivered", DT_BOOL, R_NONE, OPTBOUNCEDELIVERED, "yes" },
+  {"bounce_delivered", DT_BOOL, OPTBOUNCEDELIVERED, "yes" },
   /*
    ** .pp
    ** When this variable is \fIset\fP, Madmutt will include
    ** \fTDelivered-To:\fP header fields when bouncing messages.
    ** Postfix users may wish to \fIunset\fP this variable.
    */
-  {"check_new", DT_BOOL, R_NONE, OPTCHECKNEW, "yes" },
+  {"check_new", DT_BOOL, OPTCHECKNEW, "yes" },
   /*
    ** .pp
    ** \fBNote:\fP this option only affects \fImaildir\fP and \fIMH\fP style
@@ -224,19 +210,19 @@ struct option_t MuttVars[] = {
    ** checking each file to see if it has already been looked at.  If it's
    ** \fIunset\fP, no check for new mail is performed while the mailbox is open.
    */
-  {"collapse_unread", DT_BOOL, R_NONE, OPTCOLLAPSEUNREAD, "yes" },
+  {"collapse_unread", DT_BOOL, OPTCOLLAPSEUNREAD, "yes" },
   /*
    ** .pp
    ** When \fIunset\fP, Madmutt will not collapse a thread if it contains any
    ** unread messages.
    */
-  {"uncollapse_jump", DT_BOOL, R_NONE, OPTUNCOLLAPSEJUMP, "no" },
+  {"uncollapse_jump", DT_BOOL, OPTUNCOLLAPSEJUMP, "no" },
   /*
    ** .pp
    ** When \fIset\fP, Madmutt will jump to the next unread message, if any,
    ** when the current thread is \fIun\fPcollapsed.
    */
-  {"compose_format", DT_STR, R_BOTH, UL &ComposeFormat, "-- Madmutt: Compose  [Approx. msg size: %l   Atts: %a]%>-"},
+  {"compose_format", DT_STR, UL &ComposeFormat, "-- Madmutt: Compose  [Approx. msg size: %l   Atts: %a]%>-"},
   /*
    ** .pp
    ** Controls the format of the status line displayed in the ``compose''
@@ -253,45 +239,45 @@ struct option_t MuttVars[] = {
    ** See the text describing the ``$$status_format'' option for more
    ** information on how to set ``$$compose_format''.
    */
-  {"config_charset", DT_STR, R_NONE, UL &ConfigCharset, "" },
+  {"config_charset", DT_STR, UL &ConfigCharset, "" },
   /*
    ** .pp
    ** When defined, Madmutt will recode commands in rc files from this
    ** encoding.
    */
-  {"confirmappend", DT_BOOL, R_NONE, OPTCONFIRMAPPEND, "yes" },
+  {"confirmappend", DT_BOOL, OPTCONFIRMAPPEND, "yes" },
   /*
    ** .pp
    ** When \fIset\fP, Madmutt will prompt for confirmation when appending messages to
    ** an existing mailbox.
    */
-  {"confirmcreate", DT_BOOL, R_NONE, OPTCONFIRMCREATE, "yes" },
+  {"confirmcreate", DT_BOOL, OPTCONFIRMCREATE, "yes" },
   /*
    ** .pp
    ** When \fIset\fP, Madmutt will prompt for confirmation when saving messages to a
    ** mailbox which does not yet exist before creating it.
    */
-  {"connect_timeout", DT_NUM, R_NONE, UL &ConnectTimeout, "30" },
+  {"connect_timeout", DT_NUM, UL &ConnectTimeout, "30" },
   /*
    ** .pp
    ** Causes Madmutt to timeout a network connection (for IMAP or POP) after this
    ** many seconds if the connection is not able to be established.  A negative
    ** value causes Madmutt to wait indefinitely for the connection to succeed.
    */
-  {"content_type", DT_STR, R_NONE, UL &ContentType, "text/plain"},
+  {"content_type", DT_STR, UL &ContentType, "text/plain"},
   /*
    ** .pp
    ** Sets the default \fTContent-Type:\fP header field for the body
    ** of newly composed messages.
    */
-  {"copy", DT_QUAD, R_NONE, OPT_COPY, "yes" },
+  {"copy", DT_QUAD, OPT_COPY, "yes" },
   /*
    ** .pp
    ** This variable controls whether or not copies of your outgoing messages
    ** will be saved for later references.  Also see ``$$record'',
    ** and ``$fcc-hook''.
    */
-  {"date_format", DT_STR, R_BOTH, UL &DateFmt, "!%a, %b %d, %Y at %I:%M:%S%p %Z"},
+  {"date_format", DT_STR, UL &DateFmt, "!%a, %b %d, %Y at %I:%M:%S%p %Z"},
   /*
    ** .pp
    ** This variable controls the format of the date printed by the ``\fT%d\fP''
@@ -305,7 +291,7 @@ struct option_t MuttVars[] = {
    ** rest of the string are expanded in the \fIC\fP locale (that is in US
    ** English).
    */
-  {"default_hook", DT_STR, R_NONE, UL &DefaultHook, "~f %s !~P | (~P ~C %s)"},
+  {"default_hook", DT_STR, UL &DefaultHook, "~f %s !~P | (~P ~C %s)"},
   /*
    ** .pp
    ** This variable controls how send-hooks, message-hooks, save-hooks,
@@ -319,7 +305,7 @@ struct option_t MuttVars[] = {
    ** ``alternates'') and is to or cc'ed to a user matching the given
    ** regular expression.
    */
-  {"delete", DT_QUAD, R_NONE, OPT_DELETE, "ask-yes" },
+  {"delete", DT_QUAD, OPT_DELETE, "ask-yes" },
   /*
    ** .pp
    ** Controls whether or not messages are really deleted when closing or
@@ -327,7 +313,7 @@ struct option_t MuttVars[] = {
    ** deleting will automatically be purged without prompting.  If set to
    ** \fIno\fP, messages marked for deletion will be kept in the mailbox.
    */
-  {"delete_space", DT_BOOL, R_NONE, OPTDELSP, "no" },
+  {"delete_space", DT_BOOL, OPTDELSP, "no" },
   /*
    ** .pp
    ** When sending messages with \fTformat=flowed\fP by \fIsetting\fP the
@@ -340,27 +326,27 @@ struct option_t MuttVars[] = {
    ** \fBNote:\fP this variable only has an effect on \fIoutgoing\fP messages
    ** (if $$text_flowed is \fIset\fP) but not on incomming.
    */
-  {"delete_untag", DT_BOOL, R_NONE, OPTDELETEUNTAG, "yes" },
+  {"delete_untag", DT_BOOL, OPTDELETEUNTAG, "yes" },
   /*
    ** .pp
    ** If this option is \fIset\fP, Madmutt will untag messages when marking them
    ** for deletion.  This applies when you either explicitly delete a message,
    ** or when you save it to another folder.
    */
-  {"digest_collapse", DT_BOOL, R_NONE, OPTDIGESTCOLLAPSE, "yes" },
+  {"digest_collapse", DT_BOOL, OPTDIGESTCOLLAPSE, "yes" },
   /*
    ** .pp
    ** If this option is \fIset\fP, Madmutt's received-attachments menu will not show the subparts of
    ** individual messages in a multipart/digest.  To see these subparts, press 'v' on that menu.
    */
-  {"display_filter", DT_PATH, R_PAGER, UL &DisplayFilter, ""},
+  {"display_filter", DT_PATH, UL &DisplayFilter, ""},
   /*
    ** .pp
    ** When \fIset\fP, specifies a command used to filter messages.  When a message
    ** is viewed it is passed as standard input to $$display_filter, and the
    ** filtered message is read from the standard output.
    */
-  {"duplicate_threads", DT_BOOL, R_RESORT|R_RESORT_INIT|R_INDEX, OPTDUPTHREADS, "yes" },
+  {"duplicate_threads", DT_BOOL, OPTDUPTHREADS, "yes" },
   /*
    ** .pp
    ** This variable controls whether Madmutt, when sorting by threads, threads
@@ -368,7 +354,7 @@ struct option_t MuttVars[] = {
    ** If it is \fIset\fP, it will indicate that it thinks they are duplicates
    ** of each other with an equals sign in the thread diagram.
    */
-  {"edit_headers", DT_BOOL, R_NONE, OPTEDITHDRS, "no" },
+  {"edit_headers", DT_BOOL, OPTEDITHDRS, "no" },
   /*
    ** .pp
    ** This option allows you to edit the header of your outgoing messages
@@ -379,9 +365,9 @@ struct option_t MuttVars[] = {
    ** $$editor_headers option.
    */
 #ifdef USE_NNTP
-  {"editor_headers", DT_STR, R_NONE, UL &EditorHeaders, "From: To: Cc: Bcc: Subject: Reply-To: Newsgroups: Followup-To: X-Comment-To:" },
+  {"editor_headers", DT_STR, UL &EditorHeaders, "From: To: Cc: Bcc: Subject: Reply-To: Newsgroups: Followup-To: X-Comment-To:" },
 #else
-  {"editor_headers", DT_STR, R_NONE, UL &EditorHeaders, "From: To: Cc: Bcc: Subject: Reply-To:" },
+  {"editor_headers", DT_STR, UL &EditorHeaders, "From: To: Cc: Bcc: Subject: Reply-To:" },
 #endif
   /*
    ** .pp
@@ -393,7 +379,7 @@ struct option_t MuttVars[] = {
    ** Note: if $$edit_headers had to be turned on by force because
    ** $$strict_mailto is \fIunset\fP, this option has no effect.
    */
-  {"encode_from", DT_BOOL, R_NONE, OPTENCODEFROM, "no" },
+  {"encode_from", DT_BOOL, OPTENCODEFROM, "no" },
   /*
    ** .pp
    ** When \fIset\fP, Madmutt will \fTquoted-printable\fP encode messages when
@@ -408,7 +394,7 @@ struct option_t MuttVars[] = {
    ** you must take care of space-stuffing <tt/From / lines (with a trailing
    ** space) yourself.
    */
-  {"fast_reply", DT_BOOL, R_NONE, OPTFASTREPLY, "no" },
+  {"fast_reply", DT_BOOL, OPTFASTREPLY, "no" },
   /*
    ** .pp
    ** When \fIset\fP, the initial prompt for recipients and subject are skipped
@@ -418,13 +404,13 @@ struct option_t MuttVars[] = {
    ** \fBNote:\fP this variable has no effect when the ``$$autoedit''
    ** variable is \fIset\fP.
    */
-  {"fcc_attach", DT_BOOL, R_NONE, OPTFCCATTACH, "yes" },
+  {"fcc_attach", DT_BOOL, OPTFCCATTACH, "yes" },
   /*
    ** .pp
    ** This variable controls whether or not attachments on outgoing messages
    ** are saved along with the main body of your message.
    */
-  {"fcc_clear", DT_BOOL, R_NONE, OPTFCCCLEAR, "no" },
+  {"fcc_clear", DT_BOOL, OPTFCCCLEAR, "no" },
   /*
    ** .pp
    ** When this variable is \fIset\fP, FCCs will be stored unencrypted and
@@ -432,7 +418,7 @@ struct option_t MuttVars[] = {
    ** signed.
    ** (PGP only)
    */
-  {"folder", DT_PATH, R_NONE, UL &Maildir, "~/Mail"},
+  {"folder", DT_PATH, UL &Maildir, "~/Mail"},
   /*
    ** .pp
    ** Specifies the default location of your mailboxes.  A ``\fT+\fP'' or ``\fT=\fP'' at the
@@ -442,7 +428,7 @@ struct option_t MuttVars[] = {
    ** you use ``+'' or ``='' for any other variables since expansion takes place
    ** during the ``set'' command.
    */
-  {"folder_format", DT_STR, R_INDEX, UL &FolderFormat, "%2C %t %N %F %2l %-8.8u %-8.8g %8s %d %f"},
+  {"folder_format", DT_STR, UL &FolderFormat, "%2C %t %N %F %2l %-8.8u %-8.8g %8s %d %f"},
   /*
    ** .pp
    ** This variable allows you to customize the file browser display to your
@@ -464,7 +450,7 @@ struct option_t MuttVars[] = {
    ** .dt %|X .dd pad to the end of the line with character "X"
    ** .de
    */
-  {"followup_to", DT_BOOL, R_NONE, OPTFOLLOWUPTO, "yes" },
+  {"followup_to", DT_BOOL, OPTFOLLOWUPTO, "yes" },
   /*
    ** .pp
    ** Controls whether or not the \fTMail-Followup-To:\fP header field is
@@ -484,7 +470,7 @@ struct option_t MuttVars[] = {
    ** sent to both the list and your address, resulting in two copies
    ** of the same email for you.
    */
-  {"force_buffy_check", DT_BOOL, R_NONE, OPTFORCEBUFFYCHECK, "no" },
+  {"force_buffy_check", DT_BOOL, OPTFORCEBUFFYCHECK, "no" },
   /*
    ** .pp
    ** When \fIset\fP, it causes Madmutt to check for new mail when the
@@ -494,7 +480,7 @@ struct option_t MuttVars[] = {
    ** Also see the following variables: ``$$timeout'', ``$$mail_check'' and
    ** ``$$imap_mail_check''.
    */
-  {"forward_decode", DT_BOOL, R_NONE, OPTFORWDECODE, "yes" },
+  {"forward_decode", DT_BOOL, OPTFORWDECODE, "yes" },
   /*
    ** .pp
    ** Controls the decoding of complex MIME messages into \fTtext/plain\fP when
@@ -502,34 +488,34 @@ struct option_t MuttVars[] = {
    ** This variable is only used, if ``$$mime_forward'' is \fIunset\fP,
    ** otherwise ``$$mime_forward_decode'' is used instead.
    */
-  {"forward_edit", DT_QUAD, R_NONE, OPT_FORWEDIT, "yes" },
+  {"forward_edit", DT_QUAD, OPT_FORWEDIT, "yes" },
   /*
    ** .pp
    ** This quadoption controls whether or not the user is automatically
    ** placed in the editor when forwarding messages.  For those who always want
    ** to forward with no modification, use a setting of \fIno\fP.
    */
-  {"forward_format", DT_STR, R_NONE, UL &ForwFmt, "[%a: %s]"},
+  {"forward_format", DT_STR, UL &ForwFmt, "[%a: %s]"},
   /*
    ** .pp
    ** This variable controls the default subject when forwarding a message.
    ** It uses the same format sequences as the ``$$index_format'' variable.
    */
-  {"forward_quote", DT_BOOL, R_NONE, OPTFORWQUOTE, "no" },
+  {"forward_quote", DT_BOOL, OPTFORWQUOTE, "no" },
   /*
    ** .pp
    ** When \fIset\fP forwarded messages included in the main body of the
    ** message (when ``$$mime_forward'' is \fIunset\fP) will be quoted using
    ** ``$$indent_string''.
    */
-  {"header", DT_BOOL, R_NONE, OPTHEADER, "no" },
+  {"header", DT_BOOL, OPTHEADER, "no" },
   /*
    ** .pp
    ** When \fIset\fP, this variable causes Madmutt to include the header
    ** of the message you are replying to into the edit buffer.
    ** The ``$$weed'' setting applies.
    */
-  {"hidden_host", DT_BOOL, R_NONE, OPTHIDDENHOST, "no" },
+  {"hidden_host", DT_BOOL, OPTHIDDENHOST, "no" },
   /*
    ** .pp
    ** When \fIset\fP, Madmutt will skip the host name part of ``$$hostname'' variable
@@ -537,53 +523,53 @@ struct option_t MuttVars[] = {
    ** affect the generation of \fTMessage-ID:\fP header fields, and it will not lead to the
    ** cut-off of first-level domains.
    */
-  {"hide_limited", DT_BOOL, R_TREE|R_INDEX, OPTHIDELIMITED, "no" },
+  {"hide_limited", DT_BOOL, OPTHIDELIMITED, "no" },
   /*
    ** .pp
    ** When \fIset\fP, Madmutt will not show the presence of messages that are hidden
    ** by limiting, in the thread tree.
    */
-  {"hide_missing", DT_BOOL, R_TREE|R_INDEX, OPTHIDEMISSING, "yes" },
+  {"hide_missing", DT_BOOL, OPTHIDEMISSING, "yes" },
   /*
    ** .pp
    ** When \fIset\fP, Madmutt will not show the presence of missing messages in the
    ** thread tree.
    */
-  {"hide_thread_subject", DT_BOOL, R_TREE|R_INDEX, OPTHIDETHREADSUBJECT, "yes" },
+  {"hide_thread_subject", DT_BOOL, OPTHIDETHREADSUBJECT, "yes" },
   /*
    ** .pp
    ** When \fIset\fP, Madmutt will not show the subject of messages in the thread
    ** tree that have the same subject as their parent or closest previously
    ** displayed sibling.
    */
-  {"hide_top_limited", DT_BOOL, R_TREE|R_INDEX, OPTHIDETOPLIMITED, "no" },
+  {"hide_top_limited", DT_BOOL, OPTHIDETOPLIMITED, "no" },
   /*
    ** .pp
    ** When \fIset\fP, Madmutt will not show the presence of messages that are hidden
    ** by limiting, at the top of threads in the thread tree.  Note that when
    ** $$hide_missing is \fIset\fP, this option will have no effect.
    */
-  {"hide_top_missing", DT_BOOL, R_TREE|R_INDEX, OPTHIDETOPMISSING, "yes" },
+  {"hide_top_missing", DT_BOOL, OPTHIDETOPMISSING, "yes" },
   /*
    ** .pp
    ** When \fIset\fP, Madmutt will not show the presence of missing messages at the
    ** top of threads in the thread tree.  Note that when $$hide_limited is
    ** \fIset\fP, this option will have no effect.
    */
-  {"history", DT_NUM, R_NONE, UL &HistSize, "10" },
+  {"history", DT_NUM, UL &HistSize, "10" },
   /*
    ** .pp
    ** This variable controls the size (in number of strings remembered) of
    ** the string history buffer. The buffer is cleared each time the
    ** variable is changed.
    */
-  {"honor_followup_to", DT_QUAD, R_NONE, OPT_MFUPTO, "yes" },
+  {"honor_followup_to", DT_QUAD, OPT_MFUPTO, "yes" },
   /*
    ** .pp
    ** This variable controls whether or not a \fTMail-Followup-To:\fP header field is
    ** honored when group-replying to a message.
    */
-  {"ignore_list_reply_to", DT_BOOL, R_NONE, OPTIGNORELISTREPLYTO, "no" },
+  {"ignore_list_reply_to", DT_BOOL, OPTIGNORELISTREPLYTO, "no" },
   /*
    ** .pp
    ** Affects the behaviour of the \fIreply\fP function when replying to
@@ -597,7 +583,7 @@ struct option_t MuttVars[] = {
    ** Remember: This option works only for mailing lists which are explicitly set in your madmuttrc
    ** configuration file.
    */
-  {"imap_authenticators", DT_STR, R_NONE, UL &ImapAuthenticators, "" },
+  {"imap_authenticators", DT_STR, UL &ImapAuthenticators, "" },
   /*
    ** .pp
    ** This is a colon-delimited list of authentication methods Madmutt may
@@ -616,21 +602,21 @@ struct option_t MuttVars[] = {
    ** the previous methods are unavailable. If a method is available but
    ** authentication fails, Madmutt will not connect to the IMAP server.
    */
-  { "imap_check_subscribed",  DT_BOOL, R_NONE, OPTIMAPCHECKSUBSCRIBED, "no" },
+  { "imap_check_subscribed",  DT_BOOL, OPTIMAPCHECKSUBSCRIBED, "no" },
   /*
    ** .pp
    ** When \fIset\fP, mutt will fetch the set of subscribed folders from
    ** your server on connection, and add them to the set of mailboxes
    ** it polls for new mail. See also the ``$mailboxes'' command.
    */
-  {"imap_delim_chars", DT_STR, R_NONE, UL &ImapDelimChars, "/."},
+  {"imap_delim_chars", DT_STR, UL &ImapDelimChars, "/."},
   /*
    ** .pp
    ** This contains the list of characters which you would like to treat
    ** as folder separators for displaying IMAP paths. In particular it
    ** helps in using the '\fT=\fP' shortcut for your $$folder variable.
    */
-  {"imap_headers", DT_STR, R_INDEX, UL &ImapHeaders, "" },
+  {"imap_headers", DT_STR, UL &ImapHeaders, "" },
   /*
    ** .pp
    ** Madmutt requests these header fields in addition to the default headers
@@ -641,7 +627,7 @@ struct option_t MuttVars[] = {
    ** .pp
    ** \fBNote:\fP This is a space separated list.
    */
-  {"imap_keepalive", DT_NUM, R_NONE, UL &ImapKeepalive, "900" },
+  {"imap_keepalive", DT_NUM, UL &ImapKeepalive, "900" },
   /*
    ** .pp
    ** This variable specifies the maximum amount of time in seconds that Madmutt
@@ -656,28 +642,28 @@ struct option_t MuttVars[] = {
    ** Reduce this number if you find yourself
    ** getting disconnected from your IMAP server due to inactivity.
    */
-  {"imap_login", DT_STR, R_NONE, UL &ImapLogin, "" },
+  {"imap_login", DT_STR, UL &ImapLogin, "" },
   /*
    ** .pp
    ** Your login name on the IMAP server.
    ** .pp
    ** This variable defaults to the value of ``$$imap_user.''
    */
-  {"imap_list_subscribed", DT_BOOL, R_NONE, OPTIMAPLSUB, "no" },
+  {"imap_list_subscribed", DT_BOOL, OPTIMAPLSUB, "no" },
   /*
    ** .pp
    ** This variable configures whether IMAP folder browsing will look for
    ** only subscribed folders or all folders.  This can be toggled in the
    ** IMAP browser with the \fItoggle-subscribed\fP function.
    */
-  {"imap_mail_check", DT_NUM, R_NONE, UL &ImapBuffyTimeout, "300" },
+  {"imap_mail_check", DT_NUM, UL &ImapBuffyTimeout, "300" },
   /*
    ** .pp
    ** This variable configures how often (in seconds) Madmutt should look for
    ** new mail in IMAP folders. This is split from the ``$mail_check'' variable
    ** to generate less traffic and get more accurate information for local folders.
    */
-  {"imap_pass", DT_STR, R_NONE, UL &ImapPass, "" },
+  {"imap_pass", DT_STR, UL &ImapPass, "" },
   /*
    ** .pp
    ** Specifies the password for your IMAP account.  If \fIunset\fP, Madmutt will
@@ -687,7 +673,7 @@ struct option_t MuttVars[] = {
    ** fairly secure machine, because the superuser can read your configuration even
    ** if you are the only one who can read the file.
    */
-  {"imap_passive", DT_BOOL, R_NONE, OPTIMAPPASSIVE, "yes" },
+  {"imap_passive", DT_BOOL, OPTIMAPPASSIVE, "yes" },
   /*
    ** .pp
    ** When \fIset\fP, Madmutt will not open new IMAP connections to check for new
@@ -696,13 +682,13 @@ struct option_t MuttVars[] = {
    ** user/password pairs on Madmutt invocation, or if opening the connection
    ** is slow.
    */
-  {"imap_reconnect", DT_QUAD, R_NONE, OPT_IMAPRECONNECT, "ask-yes" },
+  {"imap_reconnect", DT_QUAD, OPT_IMAPRECONNECT, "ask-yes" },
   /*
    ** .pp
    ** Controls whether or not Madmutt will try to reconnect to IMAP server when
    ** the connection is lost.
    */
-  {"imap_servernoise", DT_BOOL, R_NONE, OPTIMAPSERVERNOISE, "yes" },
+  {"imap_servernoise", DT_BOOL, OPTIMAPSERVERNOISE, "yes" },
   /*
    ** .pp
    ** When \fIset\fP, Madmutt will display warning messages from the IMAP
@@ -711,7 +697,7 @@ struct option_t MuttVars[] = {
    ** server which are out of the users' hands, you may wish to suppress
    ** them at some point.
    */
-  {"imap_user", DT_STR, R_NONE, UL &ImapUser, "" },
+  {"imap_user", DT_STR, UL &ImapUser, "" },
   /*
    ** .pp
    ** The name of the user whose mail you intend to access on the IMAP
@@ -719,7 +705,7 @@ struct option_t MuttVars[] = {
    ** .pp
    ** This variable defaults to your user name on the local machine.
    */
-  {"implicit_autoview", DT_BOOL, R_NONE, OPTIMPLICITAUTOVIEW, "no" },
+  {"implicit_autoview", DT_BOOL, OPTIMPLICITAUTOVIEW, "no" },
   /*
    ** .pp
    ** If \fIset\fP, Madmutt will look for a mailcap entry with the
@@ -728,20 +714,20 @@ struct option_t MuttVars[] = {
    ** use the viewer defined in that entry to convert the body part to text
    ** form.
    */
-  {"include", DT_QUAD, R_NONE, OPT_INCLUDE, "ask-yes" },
+  {"include", DT_QUAD, OPT_INCLUDE, "ask-yes" },
   /*
    ** .pp
    ** Controls whether or not a copy of the message(s) you are replying to
    ** is included in your reply.
    */
-  {"indent_string", DT_STR, R_NONE, UL &Prefix, "> "},
+  {"indent_string", DT_STR, UL &Prefix, "> "},
   /*
    ** .pp
    ** Specifies the string to prepend to each line of text quoted in a
    ** message to which you are replying.  You are strongly encouraged not to
    ** change this value, as it tends to agitate the more fanatical netizens.
    */
-  {"index_format", DT_STR, R_BOTH, UL &HdrFmt, "%4C %Z %{%b %d} %-15.15L (%?l?%4l&%4c?) %s"},
+  {"index_format", DT_STR, UL &HdrFmt, "%4C %Z %{%b %d} %-15.15L (%?l?%4l&%4c?) %s"},
   /*
    ** .pp
    ** This variable allows you to customize the message index display to
@@ -810,27 +796,27 @@ struct option_t MuttVars[] = {
    ** .pp
    ** See also: ``$$to_chars''.
    */
-  {"keep_flagged", DT_BOOL, R_NONE, OPTKEEPFLAGGED, "no" },
+  {"keep_flagged", DT_BOOL, OPTKEEPFLAGGED, "no" },
   /*
    ** .pp
    ** If \fIset\fP, read messages marked as flagged will not be moved
    ** from your spool mailbox to your ``$$mbox'' mailbox, or as a result of
    ** a ``$mbox-hook'' command.
    */
-  {"locale", DT_STR, R_BOTH, UL &Locale, "C"},
+  {"locale", DT_STR, UL &Locale, "C"},
   /*
    ** .pp
    ** The locale used by \fTstrftime(3)\fP to format dates. Legal values are
    ** the strings your system accepts for the locale variable \fTLC_TIME\fP.
    */
-  {"force_list_reply", DT_QUAD, R_NONE, OPT_LISTREPLY, "ask-no" },
+  {"force_list_reply", DT_QUAD, OPT_LISTREPLY, "ask-no" },
   /*
    ** .pp
    ** This variable controls what effect ordinary replies have on mailing list
    ** messages: if \fIset\fP, a normal reply will be interpreted as list-reply
    ** while if it's \fIunset\fP the reply functions work as usual.
    */
-  {"max_display_recips", DT_NUM, R_PAGER, UL &MaxDispRecips, "0" },
+  {"max_display_recips", DT_NUM, UL &MaxDispRecips, "0" },
   /*
    ** .pp
    ** When set non-zero, this specifies the maximum number of recipient header
@@ -838,14 +824,14 @@ struct option_t MuttVars[] = {
    ** weeding is turned on. In case the number of lines exeeds its value, the
    ** last line will have 3 dots appended.
    */
-  {"max_line_length", DT_NUM, R_PAGER, UL &MaxLineLength, "0" },
+  {"max_line_length", DT_NUM, UL &MaxLineLength, "0" },
   /*
    ** .pp
    ** When \fIset\fP, the maximum line length for displaying ``format = flowed'' messages is limited
    ** to this length. A value of 0 (which is also the default) means that the
    ** maximum line length is determined by the terminal width and $$wrapmargin.
    */
-  {"maildir_trash", DT_BOOL, R_NONE, OPTMAILDIRTRASH, "no" },
+  {"maildir_trash", DT_BOOL, OPTMAILDIRTRASH, "no" },
   /*
    ** .pp
    ** If \fIset\fP, messages marked as deleted will be saved with the maildir
@@ -857,7 +843,7 @@ struct option_t MuttVars[] = {
    ** .pp
    ** It is similiar to the trash option.
    */
-  {"mark_old", DT_BOOL, R_BOTH, OPTMARKOLD, "yes" },
+  {"mark_old", DT_BOOL, OPTMARKOLD, "yes" },
   /*
    ** .pp
    ** Controls whether or not Madmutt marks \fInew\fP \fBunread\fP
@@ -867,50 +853,50 @@ struct option_t MuttVars[] = {
    ** will show up with an "O" next to them in the ``index'' menu,
    ** indicating that they are old.
    */
-  {"markers", DT_BOOL, R_PAGER, OPTMARKERS, "yes" },
+  {"markers", DT_BOOL, OPTMARKERS, "yes" },
   /*
    ** .pp
    ** Controls the display of wrapped lines in the internal pager. If set, a
    ** ``\fT+\fP'' marker is displayed at the beginning of wrapped lines. Also see
    ** the ``$$smart_wrap'' variable.
    */
-  {"mask", DT_RX, R_NONE, UL &Mask, "!^\\.[^.]"},
+  {"mask", DT_RX, UL &Mask, "!^\\.[^.]"},
   /*
    ** .pp
    ** A regular expression used in the file browser, optionally preceded by
    ** the \fInot\fP operator ``\fT!\fP''.  Only files whose names match this mask
    ** will be shown. The match is always case-sensitive.
    */
-  {"mbox", DT_PATH, R_BOTH, UL &Inbox, "~/mbox"},
+  {"mbox", DT_PATH, UL &Inbox, "~/mbox"},
   /*
    ** .pp
    ** This specifies the folder into which read mail in your ``$$spoolfile''
    ** folder will be appended.
    */
-  {"sidebar_boundary", DT_STR, R_BOTH, UL &SidebarBoundary, "." },
+  {"sidebar_boundary", DT_STR, UL &SidebarBoundary, "." },
   /*
    ** .pp
    ** When the sidebar is displayed and $$sidebar_shorten_hierarchy is \fIset\fP, this
    ** variable specifies the characters at which to split a folder name into
    ** ``hierarchy items.''
    */
-  {"sidebar_visible", DT_BOOL, R_BOTH, OPTMBOXPANE, "no" },
+  {"sidebar_visible", DT_BOOL, OPTMBOXPANE, "no" },
   /*
    ** .pp
    ** This specifies whether or not to show the sidebar (a list of folders specified
    ** with the ``mailboxes'' command).
    */
-  {"sidebar_width", DT_NUM, R_BOTH, UL &SidebarWidth, "0" },
+  {"sidebar_width", DT_NUM, UL &SidebarWidth, "0" },
   /*
    ** .pp
    ** The width of the sidebar.
    */
-  {"sidebar_newmail_only", DT_BOOL, R_BOTH, OPTSIDEBARNEWMAILONLY, "no" },
+  {"sidebar_newmail_only", DT_BOOL, OPTSIDEBARNEWMAILONLY, "no" },
   /*
    ** .pp
    ** If \fIset\fP, only folders with new mail will be shown in the sidebar.
    */
-  {"sidebar_number_format", DT_STR, R_BOTH, UL &SidebarNumberFormat, "%m%?n?(%n)?%?f?[%f]?"},
+  {"sidebar_number_format", DT_STR, UL &SidebarNumberFormat, "%m%?n?(%n)?%?f?[%f]?"},
   /*
    ** .pp
    ** This variable controls how message counts are printed when the sidebar
@@ -934,7 +920,7 @@ struct option_t MuttVars[] = {
    ** 1) These expandos only have a non-zero value for the current mailbox and
    ** will always be zero otherwise.
    */
-  {"sidebar_shorten_hierarchy", DT_BOOL, R_NONE, OPTSHORTENHIERARCHY, "no" },
+  {"sidebar_shorten_hierarchy", DT_BOOL, OPTSHORTENHIERARCHY, "no" },
   /*
    ** .pp
    ** When \fIset\fP, the ``hierarchy'' of the sidebar entries will be shortened
@@ -947,25 +933,25 @@ struct option_t MuttVars[] = {
    ** At which characters this compression is done is controled via the
    ** $$sidebar_boundary variable.
    */
-  {"mbox_type", DT_MAGIC, R_NONE, UL &DefaultMagic, "mbox" },
+  {"mbox_type", DT_MAGIC, UL &DefaultMagic, "mbox" },
   /*
    ** .pp
    ** The default mailbox type used when creating new folders. May be any of
    ** \fTmbox\fP, \fTMH\fP and \fTMaildir\fP.
    */
-  {"metoo", DT_BOOL, R_NONE, OPTMETOO, "no" },
+  {"metoo", DT_BOOL, OPTMETOO, "no" },
   /*
    ** .pp
    ** If \fIunset\fP, Madmutt will remove your address (see the ``alternates''
    ** command) from the list of recipients when replying to a message.
    */
-  {"menu_context", DT_NUM, R_NONE, UL &MenuContext, "0" },
+  {"menu_context", DT_NUM, UL &MenuContext, "0" },
   /*
    ** .pp
    ** This variable controls the number of lines of context that are given
    ** when scrolling through menus. (Similar to ``$$pager_context''.)
    */
-  {"mh_purge", DT_BOOL, R_NONE, OPTMHPURGE, "no" },
+  {"mh_purge", DT_BOOL, OPTMHPURGE, "no" },
   /*
    ** .pp
    ** When \fIunset\fP, Madmutt will mimic mh's behaviour and rename deleted messages
@@ -973,22 +959,22 @@ struct option_t MuttVars[] = {
    ** them.  If the variable is set, the message files will simply be
    ** deleted.
    */
-  {"mh_seq_flagged", DT_STR, R_NONE, UL &MhFlagged, "flagged"},
+  {"mh_seq_flagged", DT_STR, UL &MhFlagged, "flagged"},
   /*
    ** .pp
    ** The name of the MH sequence used for flagged messages.
    */
-  {"mh_seq_replied", DT_STR, R_NONE, UL &MhReplied, "replied"},
+  {"mh_seq_replied", DT_STR, UL &MhReplied, "replied"},
   /*
    ** .pp
    ** The name of the MH sequence used to tag replied messages.
    */
-  {"mh_seq_unseen", DT_STR, R_NONE, UL &MhUnseen, "unseen"},
+  {"mh_seq_unseen", DT_STR, UL &MhUnseen, "unseen"},
   /*
    ** .pp
    ** The name of the MH sequence used for unseen messages.
    */
-  {"mime_forward", DT_QUAD, R_NONE, OPT_MIMEFWD, "no" },
+  {"mime_forward", DT_QUAD, OPT_MIMEFWD, "no" },
   /*
    ** .pp
    ** When \fIset\fP, the message you are forwarding will be attached as a
@@ -1002,35 +988,35 @@ struct option_t MuttVars[] = {
    ** .pp
    ** Also see ``$$forward_decode'' and ``$$mime_forward_decode''.
    */
-  {"mime_forward_decode", DT_BOOL, R_NONE, OPTMIMEFORWDECODE, "no" },
+  {"mime_forward_decode", DT_BOOL, OPTMIMEFORWDECODE, "no" },
   /*
    ** .pp
    ** Controls the decoding of complex MIME messages into \fTtext/plain\fP when
    ** forwarding a message while ``$$mime_forward'' is \fIset\fP. Otherwise
    ** ``$$forward_decode'' is used instead.
    */
-  {"mime_forward_rest", DT_QUAD, R_NONE, OPT_MIMEFWDREST, "yes" },
+  {"mime_forward_rest", DT_QUAD, OPT_MIMEFWDREST, "yes" },
   /*
    ** .pp
    ** When forwarding multiple attachments of a MIME message from the recvattach
    ** menu, attachments which cannot be decoded in a reasonable manner will
    ** be attached to the newly composed message if this option is set.
    */
-  {"move", DT_QUAD, R_NONE, OPT_MOVE, "ask-no" },
+  {"move", DT_QUAD, OPT_MOVE, "ask-no" },
   /*
    ** .pp
    ** Controls whether or not Madmutt will move read messages
    ** from your spool mailbox to your ``$$mbox'' mailbox, or as a result of
    ** a ``$mbox-hook'' command.
    */
-  {"message_format", DT_STR, R_NONE, UL &MsgFmt, "%s"},
+  {"message_format", DT_STR, UL &MsgFmt, "%s"},
   /*
    ** .pp
    ** This is the string displayed in the ``attachment'' menu for
    ** attachments of type \fTmessage/rfc822\fP.  For a full listing of defined
    ** \fTprintf(3)\fP-like sequences see the section on ``$$index_format''.
    */
-  {"msgid_format", DT_STR, R_NONE, UL &MsgIdFormat, "%Y%m%d%h%M%s.G%P%p"},
+  {"msgid_format", DT_STR, UL &MsgIdFormat, "%Y%m%d%h%M%s.G%P%p"},
   /*
    ** .pp
    ** This is the format for the ``local part'' of the \fTMessage-ID:\fP header
@@ -1060,13 +1046,13 @@ struct option_t MuttVars[] = {
    ** \fBNote:\fP Please only change this setting if you know what you are doing.
    ** Also make sure to consult RFC2822 to produce technically \fIvalid\fP strings.
    */
-  {"narrow_tree", DT_BOOL, R_TREE|R_INDEX, OPTNARROWTREE, "no" },
+  {"narrow_tree", DT_BOOL, OPTNARROWTREE, "no" },
   /*
    ** .pp
    ** This variable, when \fIset\fP, makes the thread tree narrower, allowing
    ** deeper threads to fit on the screen.
    */
-  { "net_inc", DT_NUM, R_NONE, UL &NetInc, "10" },
+  { "net_inc", DT_NUM, UL &NetInc, "10" },
   /*
   ** .pp
   ** Operations that expect to transfer a large amount of data over the
@@ -1075,7 +1061,7 @@ struct option_t MuttVars[] = {
   ** .pp
   ** See also ``$$read_inc'' and ``$$write_inc''.
   */
-  {"pager_context", DT_NUM, R_NONE, UL &PagerContext, "0" },
+  {"pager_context", DT_NUM, UL &PagerContext, "0" },
   /*
    ** .pp
    ** This variable controls the number of lines of context that are given
@@ -1083,7 +1069,7 @@ struct option_t MuttVars[] = {
    ** default, Madmutt will display the line after the last one on the screen
    ** at the top of the next page (0 lines of context).
    */
-  {"pager_format", DT_STR, R_PAGER, UL &PagerFmt, "-%Z- %C/%m: %-20.20n   %s"},
+  {"pager_format", DT_STR, UL &PagerFmt, "-%Z- %C/%m: %-20.20n   %s"},
   /*
    ** .pp
    ** This variable controls the format of the one-line message ``status''
@@ -1091,7 +1077,7 @@ struct option_t MuttVars[] = {
    ** pager.  The valid sequences are listed in the ``$$index_format''
    ** section.
    */
-  {"pager_index_lines", DT_NUM, R_PAGER, UL &PagerIndexLines, "0" },
+  {"pager_index_lines", DT_NUM, UL &PagerIndexLines, "0" },
   /*
    ** .pp
    ** Determines the number of lines of a mini-index which is shown when in
@@ -1106,14 +1092,14 @@ struct option_t MuttVars[] = {
    ** is less than \fIpager_index_lines\fP, then the index will only use as
    ** many lines as it needs.
    */
-  {"pager_stop", DT_BOOL, R_NONE, OPTPAGERSTOP, "no" },
+  {"pager_stop", DT_BOOL, OPTPAGERSTOP, "no" },
   /*
    ** .pp
    ** When \fIset\fP, the internal-pager will \fBnot\fP move to the next message
    ** when you are at the end of a message and invoke the \fInext-page\fP
    ** function.
    */
-  {"pgp_retainable_sigs", DT_BOOL, R_NONE, OPTPGPRETAINABLESIG, "no" },
+  {"pgp_retainable_sigs", DT_BOOL, OPTPGPRETAINABLESIG, "no" },
   /*
    ** .pp
    ** If \fIset\fP, signed and encrypted messages will consist of nested
@@ -1124,7 +1110,7 @@ struct option_t MuttVars[] = {
    ** removed, while the inner multipart/signed part is retained.
    ** (PGP only)
    */
-  {"pgp_show_unusable", DT_BOOL, R_NONE, OPTPGPSHOWUNUSABLE, "yes" },
+  {"pgp_show_unusable", DT_BOOL, OPTPGPSHOWUNUSABLE, "yes" },
   /*
    ** .pp
    ** If \fIset\fP, Madmutt will display non-usable keys on the PGP key selection
@@ -1132,7 +1118,7 @@ struct option_t MuttVars[] = {
    ** have been marked as ``disabled'' by the user.
    ** (PGP only)
    */
-  {"pgp_sign_as", DT_STR, R_NONE, UL &PgpSignAs, "" },
+  {"pgp_sign_as", DT_STR, UL &PgpSignAs, "" },
   /*
    ** .pp
    ** If you have more than one key pair, this option allows you to specify
@@ -1140,7 +1126,7 @@ struct option_t MuttVars[] = {
    ** keyid form to specify your key (e.g., ``\fT0x00112233\fP'').
    ** (PGP only)
    */
-  {"pgp_sort_keys", DT_SORT|DT_SORT_KEYS, R_NONE, UL &PgpSortKeys, "address" },
+  {"pgp_sort_keys", DT_SORT|DT_SORT_KEYS, UL &PgpSortKeys, "address" },
   /*
    ** .pp
    ** Specifies how the entries in the ``pgp keys'' menu are sorted. The
@@ -1157,7 +1143,7 @@ struct option_t MuttVars[] = {
    ** ``reverse-''.
    ** (PGP only)
    */
-  {"forward_decrypt", DT_BOOL, R_NONE, OPTFORWDECRYPT, "yes" },
+  {"forward_decrypt", DT_BOOL, OPTFORWDECRYPT, "yes" },
   /*
    ** .pp
    ** Controls the handling of encrypted messages when forwarding a message.
@@ -1166,7 +1152,7 @@ struct option_t MuttVars[] = {
    ** ``$$mime_forward_decode'' is \fIunset\fP.
    ** (PGP only)
    */
-  {"smime_encrypt_with", DT_STR, R_NONE, UL &SmimeCryptAlg, "" },
+  {"smime_encrypt_with", DT_STR, UL &SmimeCryptAlg, "" },
   /*
    ** .pp
    ** This sets the algorithm that should be used for encryption.
@@ -1176,14 +1162,14 @@ struct option_t MuttVars[] = {
    ** If \fIunset\fP ``\fI3des\fP'' (TripleDES) is used.
    ** (S/MIME only)
    */
-  {"smime_default_key", DT_STR, R_NONE, UL &SmimeDefaultKey, "" },
+  {"smime_default_key", DT_STR, UL &SmimeDefaultKey, "" },
   /*
    ** .pp
    ** This is the default key-pair to use for signing. This must be set to the
    ** keyid (the hash-value that OpenSSL generates) to work properly
    ** (S/MIME only)
    */
-  {"pipe_split", DT_BOOL, R_NONE, OPTPIPESPLIT, "no" },
+  {"pipe_split", DT_BOOL, OPTPIPESPLIT, "no" },
   /*
    ** .pp
    ** Used in connection with the \fIpipe-message\fP command and the ``tag-
@@ -1194,7 +1180,7 @@ struct option_t MuttVars[] = {
    ** In both cases the messages are piped in the current sorted order,
    ** and the ``$$pipe_sep'' separator is added after each message.
    */
-  {"pipe_decode", DT_BOOL, R_NONE, OPTPIPEDECODE, "no" },
+  {"pipe_decode", DT_BOOL, OPTPIPEDECODE, "no" },
   /*
    ** .pp
    ** Used in connection with the \fIpipe-message\fP command.  When \fIunset\fP,
@@ -1202,13 +1188,13 @@ struct option_t MuttVars[] = {
    ** will weed headers and will attempt to PGP/MIME decode the messages
    ** first.
    */
-  {"pipe_sep", DT_STR, R_NONE, UL &PipeSep, "\n"},
+  {"pipe_sep", DT_STR, UL &PipeSep, "\n"},
   /*
    ** .pp
    ** The separator to add between messages when piping a list of tagged
    ** messages to an external Unix command.
    */
-  {"pop_authenticators", DT_STR, R_NONE, UL &PopAuthenticators, "" },
+  {"pop_authenticators", DT_STR, UL &PopAuthenticators, "" },
   /*
    ** .pp
    ** This is a colon-delimited list of authentication methods Madmutt may
@@ -1222,20 +1208,20 @@ struct option_t MuttVars[] = {
    ** .pp
    ** Example: \fTset pop_authenticators="digest-md5:apop:user"\fP
    */
-  {"pop_mail_check", DT_NUM, R_NONE, UL &PopCheckTimeout, "60" },
+  {"pop_mail_check", DT_NUM, UL &PopCheckTimeout, "60" },
   /*
    ** .pp
    ** This variable configures how often (in seconds) Madmutt should look for
    ** new mail.
    */
-  {"pop_delete", DT_QUAD, R_NONE, OPT_POPDELETE, "ask-no" },
+  {"pop_delete", DT_QUAD, OPT_POPDELETE, "ask-no" },
   /*
    ** .pp
    ** If \fIset\fP, Madmutt will delete successfully downloaded messages from the POP
    ** server when using the ``fetch-mail'' function.  When \fIunset\fP, Madmutt will
    ** download messages but also leave them on the POP server.
    */
-  {"pop_host", DT_STR, R_NONE, UL &PopHost, ""},
+  {"pop_host", DT_STR, UL &PopHost, ""},
   /*
    ** .pp
    ** The name of your POP server for the ``fetch-mail'' function.  You
@@ -1247,27 +1233,27 @@ struct option_t MuttVars[] = {
    ** presents a security risk since the superuser of your machine may read it
    ** regardless of the file's permissions.
    */
-  {"pop_last", DT_BOOL, R_NONE, OPTPOPLAST, "no" },
+  {"pop_last", DT_BOOL, OPTPOPLAST, "no" },
   /*
    ** .pp
    ** If this variable is \fIset\fP, Madmutt will try to use the ``\fTLAST\fP'' POP command
    ** for retrieving only unread messages from the POP server when using
    ** the ``fetch-mail'' function.
    */
-  {"pop_reconnect", DT_QUAD, R_NONE, OPT_POPRECONNECT, "ask-yes" },
+  {"pop_reconnect", DT_QUAD, OPT_POPRECONNECT, "ask-yes" },
   /*
    ** .pp
    ** Controls whether or not Madmutt will try to reconnect to a POP server if the
    ** connection is lost.
    */
-  {"pop_user", DT_STR, R_NONE, UL &PopUser, "" },
+  {"pop_user", DT_STR, UL &PopUser, "" },
   /*
    ** .pp
    ** Your login name on the POP server.
    ** .pp
    ** This variable defaults to your user name on the local machine.
    */
-  {"pop_pass", DT_STR, R_NONE, UL &PopPass, ""},
+  {"pop_pass", DT_STR, UL &PopPass, ""},
   /*
    ** .pp
    ** Specifies the password for your POP account.  If \fIunset\fP, Madmutt will
@@ -1277,13 +1263,13 @@ struct option_t MuttVars[] = {
    ** presents a security risk since the superuser of your machine may read it
    ** regardless of the file's permissions.
    */
-  {"postpone", DT_QUAD, R_NONE, OPT_POSTPONE, "ask-yes" },
+  {"postpone", DT_QUAD, OPT_POSTPONE, "ask-yes" },
   /*
    ** .pp
    ** Controls whether or not messages are saved in the ``$$postponed''
    ** mailbox when you elect not to send immediately.
    */
-  {"postponed", DT_PATH, R_NONE, UL &Postponed, "~/postponed"},
+  {"postponed", DT_PATH, UL &Postponed, "~/postponed"},
   /*
    ** .pp
    ** Madmutt allows you to indefinitely ``$postpone sending a message'' which
@@ -1291,7 +1277,7 @@ struct option_t MuttVars[] = {
    ** in the mailbox specified by this variable.  Also see the ``$$postpone''
    ** variable.
    */
-  {"preconnect", DT_STR, R_NONE, UL &Preconnect, "" },
+  {"preconnect", DT_STR, UL &Preconnect, "" },
   /*
    ** .pp
    ** If \fIset\fP, a shell command to be executed if Madmutt fails to establish
@@ -1308,19 +1294,19 @@ struct option_t MuttVars[] = {
    ** \fBNote:\fP For this example to work, you must be able to log in to the
    ** remote machine without having to enter a password.
    */
-  {"print", DT_QUAD, R_NONE, OPT_PRINT, "ask-no" },
+  {"print", DT_QUAD, OPT_PRINT, "ask-no" },
   /*
    ** .pp
    ** Controls whether or not Madmutt really prints messages.
    ** This is set to \fIask-no\fP by default, because some people
    ** accidentally hit ``p'' often.
    */
-  {"print_command", DT_PATH, R_NONE, UL &PrintCmd, "lpr"},
+  {"print_command", DT_PATH, UL &PrintCmd, "lpr"},
   /*
    ** .pp
    ** This specifies the command pipe that should be used to print messages.
    */
-  {"print_decode", DT_BOOL, R_NONE, OPTPRINTDECODE, "yes" },
+  {"print_decode", DT_BOOL, OPTPRINTDECODE, "yes" },
   /*
    ** .pp
    ** Used in connection with the print-message command.  If this
@@ -1331,7 +1317,7 @@ struct option_t MuttVars[] = {
    ** some advanced printer filter which is able to properly format
    ** e-mail messages for printing.
    */
-  {"print_split", DT_BOOL, R_NONE, OPTPRINTSPLIT, "no" },
+  {"print_split", DT_BOOL, OPTPRINTSPLIT, "no" },
   /*
    ** .pp
    ** Used in connection with the print-message command.  If this option
@@ -1344,7 +1330,7 @@ struct option_t MuttVars[] = {
    ** Those who use the \fTenscript(1)\fP program's mail-printing mode will
    ** most likely want to set this option.
    */
-  {"prompt_after", DT_BOOL, R_NONE, OPTPROMPTAFTER, "yes" },
+  {"prompt_after", DT_BOOL, OPTPROMPTAFTER, "yes" },
   /*
    ** .pp
    ** If you use an \fIexternal\fP ``$$pager'', setting this variable will
@@ -1352,7 +1338,7 @@ struct option_t MuttVars[] = {
    ** than returning to the index menu.  If \fIunset\fP, Madmutt will return to the
    ** index menu when the external pager exits.
    */
-  {"query_command", DT_PATH, R_NONE, UL &QueryCmd, ""},
+  {"query_command", DT_PATH, UL &QueryCmd, ""},
   /*
    ** .pp
    ** This specifies the command that Madmutt will use to make external address
@@ -1360,20 +1346,20 @@ struct option_t MuttVars[] = {
    ** with the query string the user types.  See ``$query'' for more
    ** information.
    */
-  {"quote_empty", DT_BOOL, R_NONE, OPTQUOTEEMPTY, "yes" },
+  {"quote_empty", DT_BOOL, OPTQUOTEEMPTY, "yes" },
   /*
    ** .pp
    ** Controls whether or not empty lines will be quoted using
    ** ``$indent_string''.
    */
-  {"quote_quoted", DT_BOOL, R_NONE, OPTQUOTEQUOTED, "no" },
+  {"quote_quoted", DT_BOOL, OPTQUOTEQUOTED, "no" },
   /*
    ** .pp
    ** Controls how quoted lines will be quoted. If \fIset\fP, one quote
    ** character will be added to the end of existing prefix.  Otherwise,
    ** quoted lines will be prepended by ``$indent_string''.
    */
-  {"quote_regexp", DT_RX, R_PAGER, UL &QuoteRegexp, "^([ \t]*[|>:}#])+"},
+  {"quote_regexp", DT_RX, UL &QuoteRegexp, "^([ \t]*[|>:}#])+"},
   /*
    ** .pp
    ** A regular expression used in the internal-pager to determine quoted
@@ -1384,7 +1370,7 @@ struct option_t MuttVars[] = {
    ** matches \fIexactly\fP the quote characters at the beginning of quoted
    ** lines.
    */
-  {"read_inc", DT_NUM, R_NONE, UL &ReadInc, "10" },
+  {"read_inc", DT_NUM, UL &ReadInc, "10" },
   /*
    ** .pp
    ** If set to a value greater than 0, Madmutt will display which message it
@@ -1398,7 +1384,7 @@ struct option_t MuttVars[] = {
    ** .pp
    ** Also see the ``$$write_inc'' variable.
    */
-  {"realname", DT_STR, R_BOTH, UL &Realname, "" },
+  {"realname", DT_STR, UL &Realname, "" },
   /*
    ** .pp
    ** This variable specifies what ``real'' or ``personal'' name should be used
@@ -1410,7 +1396,7 @@ struct option_t MuttVars[] = {
    ** variable will \fInot\fP be used when the user has set a real name
    ** in the $$from variable.
    */
-  {"recall", DT_QUAD, R_NONE, OPT_RECALL, "ask-yes" },
+  {"recall", DT_QUAD, OPT_RECALL, "ask-yes" },
   /*
    ** .pp
    ** Controls whether or not Madmutt recalls postponed messages
@@ -1419,14 +1405,14 @@ struct option_t MuttVars[] = {
    ** Setting this variable to \fIyes\fP is not generally useful, and thus not
    ** recommended.
    */
-  {"reply_regexp", DT_RX, R_INDEX|R_RESORT, UL &ReplyRegexp, "^(re([\\[0-9\\]+])*|aw):[ \t]*"},
+  {"reply_regexp", DT_RX, UL &ReplyRegexp, "^(re([\\[0-9\\]+])*|aw):[ \t]*"},
   /*
    ** .pp
    ** A regular expression used to recognize reply messages when threading
    ** and replying. The default value corresponds to the English ``Re:'' and
    ** the German ``Aw:''.
    */
-  {"reply_to", DT_QUAD, R_NONE, OPT_REPLYTO, "ask-yes" },
+  {"reply_to", DT_QUAD, OPT_REPLYTO, "ask-yes" },
   /*
    ** .pp
    ** If \fIset\fP, when replying to a message, Madmutt will use the address listed
@@ -1438,14 +1424,14 @@ struct option_t MuttVars[] = {
    ** header field to the list address and you want to send a private
    ** message to the author of a message.
    */
-  {"resolve", DT_BOOL, R_NONE, OPTRESOLVE, "yes" },
+  {"resolve", DT_BOOL, OPTRESOLVE, "yes" },
   /*
    ** .pp
    ** When set, the cursor will be automatically advanced to the next
    ** (possibly undeleted) message whenever a command that modifies the
    ** current message is executed.
    */
-  {"reverse_alias", DT_BOOL, R_BOTH, OPTREVALIAS, "no" },
+  {"reverse_alias", DT_BOOL, OPTREVALIAS, "no" },
   /*
    ** .pp
    ** This variable controls whether or not Madmutt will display the ``personal''
@@ -1463,7 +1449,7 @@ struct option_t MuttVars[] = {
    ** ``abd30425@somewhere.net.''  This is useful when the person's e-mail
    ** address is not human friendly (like CompuServe addresses).
    */
-  {"reverse_name", DT_BOOL, R_BOTH, OPTREVNAME, "no" },
+  {"reverse_name", DT_BOOL, OPTREVNAME, "no" },
   /*
    ** .pp
    ** It may sometimes arrive that you receive mail to a certain machine,
@@ -1475,7 +1461,7 @@ struct option_t MuttVars[] = {
    ** used doesn't match your alternates, the \fTFrom:\fP line will use
    ** your address on the current machine.
    */
-  {"reverse_realname", DT_BOOL, R_BOTH, OPTREVREAL, "yes" },
+  {"reverse_realname", DT_BOOL, OPTREVREAL, "yes" },
   /*
    ** .pp
    ** This variable fine-tunes the behaviour of the $reverse_name feature.
@@ -1483,7 +1469,7 @@ struct option_t MuttVars[] = {
    ** possibly including eventual real names.  When it is \fIunset\fP, Madmutt will
    ** override any such real names with the setting of the $realname variable.
    */
-  {"sig_dashes", DT_BOOL, R_NONE, OPTSIGDASHES, "yes" },
+  {"sig_dashes", DT_BOOL, OPTSIGDASHES, "yes" },
   /*
    ** .pp
    ** If set, a line containing ``\fT-- \fP'' (dash, dash, space)
@@ -1495,7 +1481,7 @@ struct option_t MuttVars[] = {
    ** For example, Madmutt has the ability to highlight
    ** the signature in a different color in the builtin pager.
    */
-  {"signoff_string", DT_STR, R_NONE, UL &SignOffString, "" },
+  {"signoff_string", DT_STR, UL &SignOffString, "" },
   /*
    ** .pp
    ** If \fIset\fP, this string will be inserted before the signature. This is useful
@@ -1505,7 +1491,7 @@ struct option_t MuttVars[] = {
    ** witty quotes into your mails, better use a signature file instead of
    ** the signoff string.
    */
-  {"simple_search", DT_STR, R_NONE, UL &SimpleSearch, "~f %s | ~s %s"},
+  {"simple_search", DT_STR, UL &SimpleSearch, "~f %s | ~s %s"},
   /*
    ** .pp
    ** Specifies how Madmutt should expand a simple search into a real search
@@ -1518,7 +1504,7 @@ struct option_t MuttVars[] = {
    ** .pp
    ** \fT~f joe | ~s joe\fP
    */
-  {"smart_wrap", DT_BOOL, R_PAGER, OPTWRAP, "yes" },
+  {"smart_wrap", DT_BOOL, OPTWRAP, "yes" },
   /*
    ** .pp
    ** Controls the display of lines longer than the screen width in the
@@ -1526,14 +1512,14 @@ struct option_t MuttVars[] = {
    ** If \fIunset\fP, lines are simply wrapped at the screen edge. Also see the
    ** ``$$markers'' variable.
    */
-  {"smileys", DT_RX, R_PAGER, UL &Smileys, "(>From )|(:[-^]?[][)(><}{|/DP])"},
+  {"smileys", DT_RX, UL &Smileys, "(>From )|(:[-^]?[][)(><}{|/DP])"},
   /*
    ** .pp
    ** The \fIpager\fP uses this variable to catch some common false
    ** positives of ``$$quote_regexp'', most notably smileys in the beginning
    ** of a line
    */
-  {"sleep_time", DT_NUM, R_NONE, UL &SleepTime, "1" },
+  {"sleep_time", DT_NUM, UL &SleepTime, "1" },
   /*
    ** .pp
    ** Specifies time, in seconds, to pause while displaying certain informational
@@ -1541,7 +1527,7 @@ struct option_t MuttVars[] = {
    ** messages from the current folder.  The default is to pause one second, so
    ** a value of zero for this option suppresses the pause.
    */
-  {"sort", DT_SORT, R_INDEX|R_RESORT, UL &Sort, "date" },
+  {"sort", DT_SORT, UL &Sort, "date" },
   /*
    ** .pp
    ** Specifies how to sort messages in the \fIindex\fP menu.  Valid values
@@ -1563,7 +1549,7 @@ struct option_t MuttVars[] = {
    ** You may optionally use the ``reverse-'' prefix to specify reverse sorting
    ** order (example: \fTset sort=reverse-date-sent\fP).
    */
-  {"sort_alias", DT_SORT|DT_SORT_ALIAS, R_NONE, UL &SortAlias, "alias" },
+  {"sort_alias", DT_SORT|DT_SORT_ALIAS, UL &SortAlias, "alias" },
   /*
    ** .pp
    ** Specifies how the entries in the ``alias'' menu are sorted.  The
@@ -1575,7 +1561,7 @@ struct option_t MuttVars[] = {
    ** .  unsorted (leave in order specified in .muttrc)
    ** .te
    */
-  {"sort_aux", DT_SORT|DT_SORT_AUX, R_INDEX|R_RESORT_BOTH, UL &SortAux, "date" },
+  {"sort_aux", DT_SORT|DT_SORT_AUX, UL &SortAux, "date" },
   /*
    ** .pp
    ** When sorting by threads, this variable controls how threads are sorted
@@ -1595,7 +1581,7 @@ struct option_t MuttVars[] = {
    ** (which is not the right thing to do, but kept to not break any existing
    ** configuration setting).
    */
-  {"sort_browser", DT_SORT|DT_SORT_BROWSER, R_NONE, UL &BrowserSort, "alpha" },
+  {"sort_browser", DT_SORT|DT_SORT_BROWSER, UL &BrowserSort, "alpha" },
   /*
    ** .pp
    ** Specifies how to sort entries in the file browser.  By default, the
@@ -1611,7 +1597,7 @@ struct option_t MuttVars[] = {
    ** You may optionally use the ``reverse-'' prefix to specify reverse sorting
    ** order (example: \fTset sort_browser=reverse-date\fP).
    */
-  {"sort_re", DT_BOOL, R_INDEX|R_RESORT|R_RESORT_INIT, OPTSORTRE, "yes" },
+  {"sort_re", DT_BOOL, OPTSORTRE, "yes" },
   /*
    ** .pp
    ** This variable is only useful when sorting by threads with
@@ -1623,7 +1609,7 @@ struct option_t MuttVars[] = {
    ** Madmutt will attach the message whether or not this is the case,
    ** as long as the non-``$$reply_regexp'' parts of both messages are identical.
    */
-  {"spoolfile", DT_PATH, R_NONE, UL &Spoolfile, "" },
+  {"spoolfile", DT_PATH, UL &Spoolfile, "" },
   /*
    ** .pp
    ** If your spool mailbox is in a non-default place where Madmutt cannot find
@@ -1631,7 +1617,7 @@ struct option_t MuttVars[] = {
    ** automatically set this variable to the value of the environment
    ** variable $$$MAIL if it is not set.
    */
-  {"status_chars", DT_STR, R_BOTH, UL &StChars, "-*%A"},
+  {"status_chars", DT_STR, UL &StChars, "-*%A"},
   /*
    ** .pp
    ** Controls the characters used by the ``\fT%r\fP'' indicator in
@@ -1645,7 +1631,7 @@ struct option_t MuttVars[] = {
    ** opened in attach-message mode (Certain operations like composing
    ** a new mail, replying, forwarding, etc. are not permitted in this mode).
    */
-  {"status_format", DT_STR, R_BOTH, UL &Status, "-%r-Madmutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---"},
+  {"status_format", DT_STR, UL &Status, "-%r-Madmutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---"},
   /*
    ** .pp
    ** Controls the format of the status line displayed in the \fIindex\fP
@@ -1718,7 +1704,7 @@ struct option_t MuttVars[] = {
    ** will replace any dots in the expansion by underscores. This might be helpful
    ** with IMAP folders that don't like dots in folder names.
    */
-  {"strict_mailto", DT_BOOL, R_NONE, OPTSTRICTMAILTO, "yes" },
+  {"strict_mailto", DT_BOOL, OPTSTRICTMAILTO, "yes" },
   /*
    **
    ** .pp
@@ -1732,7 +1718,7 @@ struct option_t MuttVars[] = {
    ** ``X-Mailto-'' and the message including headers will be shown in the editor
    ** regardless of what ``$$edit_headers'' is set to.
    **/
-  {"strict_threads", DT_BOOL, R_RESORT|R_RESORT_INIT|R_INDEX, OPTSTRICTTHREADS, "no" },
+  {"strict_threads", DT_BOOL, OPTSTRICTTHREADS, "no" },
   /*
    ** .pp
    ** If \fIset\fP, threading will only make use of the ``\fTIn-Reply-To:\fP'' and
@@ -1744,28 +1730,28 @@ struct option_t MuttVars[] = {
    ** ``$$sort_re'' for a less drastic way of controlling this
    ** behaviour.
    */
-  {"strip_was", DT_BOOL, R_NONE, OPTSTRIPWAS, "no" },
+  {"strip_was", DT_BOOL, OPTSTRIPWAS, "no" },
   /**
   ** .pp
   ** When \fIset\fP, Madmutt will remove the trailing part of the ``\fTSubject:\fP''
   ** line which matches $$strip_was_regex when replying. This is useful to
   ** properly react on subject changes and reduce ``subject noise.'' (esp. in Usenet)
   **/
-  {"strip_was_regex", DT_RX, R_NONE, UL &StripWasRegexp, "\\([Ww][Aa][RrSs]: .*\\)[ ]*$"},
+  {"strip_was_regex", DT_RX, UL &StripWasRegexp, "\\([Ww][Aa][RrSs]: .*\\)[ ]*$"},
   /**
   ** .pp
   ** When non-empty and $$strip_was is \fIset\fP, Madmutt will remove this
   ** trailing part of the ``Subject'' line when replying if it won't be empty
   ** afterwards.
   **/
-  {"stuff_quoted", DT_BOOL, R_BOTH, OPTSTUFFQUOTED, "no" },
+  {"stuff_quoted", DT_BOOL, OPTSTUFFQUOTED, "no" },
   /*
    ** .pp
    ** If \fIset\fP, attachments with flowed format will have their quoting ``stuffed'',
    ** i.e. a space will be inserted between the quote characters and the actual
    ** text.
    */
-  {"text_flowed", DT_BOOL, R_NONE, OPTTEXTFLOWED, "no" },
+  {"text_flowed", DT_BOOL, OPTTEXTFLOWED, "no" },
   /*
    ** .pp
    ** When \fIset\fP, Madmutt will generate \fTtext/plain; format=flowed\fP attachments.
@@ -1775,13 +1761,13 @@ struct option_t MuttVars[] = {
    ** .pp
    ** Note that $$indent_string is ignored when this option is set.
    */
-  {"thread_received", DT_BOOL, R_RESORT|R_RESORT_INIT|R_INDEX, OPTTHREADRECEIVED, "no" },
+  {"thread_received", DT_BOOL, OPTTHREADRECEIVED, "no" },
   /*
    ** .pp
    ** When \fIset\fP, Madmutt uses the date received rather than the date sent
    ** to thread messages by subject.
    */
-  {"thorough_search", DT_BOOL, R_NONE, OPTTHOROUGHSRC, "no" },
+  {"thorough_search", DT_BOOL, OPTTHOROUGHSRC, "no" },
   /*
    ** .pp
    ** Affects the \fT~b\fP and \fT~h\fP search operations described in
@@ -1789,13 +1775,13 @@ struct option_t MuttVars[] = {
    ** messages to be searched are decoded before searching.  If \fIunset\fP,
    ** messages are searched as they appear in the folder.
    */
-  {"tilde", DT_BOOL, R_PAGER, OPTTILDE, "no" },
+  {"tilde", DT_BOOL, OPTTILDE, "no" },
   /*
    ** .pp
    ** When \fIset\fP, the internal-pager will pad blank lines to the bottom of the
    ** screen with a tilde (~).
    */
-  {"timeout", DT_NUM, R_NONE, UL &Timeout, "600" },
+  {"timeout", DT_NUM, UL &Timeout, "600" },
   /*
    ** .pp
    ** This variable controls the \fInumber of seconds\fP Madmutt will wait
@@ -1803,7 +1789,7 @@ struct option_t MuttVars[] = {
    ** checking for new mail.  A value of zero or less will cause Madmutt
    ** to never time out.
    */
-  {"to_chars", DT_STR, R_BOTH, UL &Tochars, " +TCFL"},
+  {"to_chars", DT_STR, UL &Tochars, " +TCFL"},
   /*
    ** .pp
    ** Controls the character used to indicate mail addressed to you.  The
@@ -1817,7 +1803,7 @@ struct option_t MuttVars[] = {
    ** by \fIyou\fP.  The sixth character is used to indicate when a mail
    ** was sent to a mailing-list you're subscribe to (default: L).
    */
-  {"trash", DT_PATH, R_NONE, UL &TrashPath, "" },
+  {"trash", DT_PATH, UL &TrashPath, "" },
   /*
    ** .pp
    ** If \fIset\fP, this variable specifies the path of the trash folder where the
@@ -1827,7 +1813,7 @@ struct option_t MuttVars[] = {
    ** \fBNote\fP: When you delete a message in the trash folder, it is really
    ** deleted, so that there is no way to recover mail.
    */
-  {"tunnel", DT_STR, R_NONE, UL &Tunnel, "" },
+  {"tunnel", DT_STR, UL &Tunnel, "" },
   /*
    ** .pp
    ** Setting this variable will cause Madmutt to open a pipe to a command
@@ -1839,13 +1825,13 @@ struct option_t MuttVars[] = {
    ** \fBNote:\fP For this example to work you must be able to log in to the remote
    ** machine without having to enter a password.
    */
-  {"umask", DT_NUM, R_NONE, UL &Umask, "0077" },
+  {"umask", DT_NUM, UL &Umask, "0077" },
   /*
    ** .pp
    ** This sets the umask that will be used by Madmutt when creating all
    ** kinds of files. If \fIunset\fP, the default value is \fT077\fP.
    */
-  {"use_from", DT_BOOL, R_NONE, OPTUSEFROM, "yes" },
+  {"use_from", DT_BOOL, OPTUSEFROM, "yes" },
   /*
    ** .pp
    ** When \fIset\fP, Madmutt will generate the ``\fTFrom:\fP'' header field when
@@ -1854,7 +1840,7 @@ struct option_t MuttVars[] = {
    ** command.
    */
 #ifdef HAVE_LIBIDN
-  {"use_idn", DT_BOOL, R_BOTH, OPTUSEIDN, "yes" },
+  {"use_idn", DT_BOOL, OPTUSEIDN, "yes" },
   /*
    ** .pp
    ** Availability: IDN
@@ -1866,14 +1852,14 @@ struct option_t MuttVars[] = {
    ** This variable only affects decoding.
    */
 #endif /* HAVE_LIBIDN */
-  {"agent_string", DT_BOOL, R_NONE, OPTXMAILER, "yes" },
+  {"agent_string", DT_BOOL, OPTXMAILER, "yes" },
   /*
    ** .pp
    ** When \fIset\fP, Madmutt will add a ``\fTUser-Agent:\fP'' header to outgoing
    ** messages, indicating which version of Madmutt was used for composing
    ** them.
    */
-  {"wait_key", DT_BOOL, R_NONE, OPTWAITKEY, "yes" },
+  {"wait_key", DT_BOOL, OPTWAITKEY, "yes" },
   /*
    ** .pp
    ** Controls whether Madmutt will ask you to press a key after \fIshell-
@@ -1887,13 +1873,13 @@ struct option_t MuttVars[] = {
    ** When \fIset\fP, Madmutt will always ask for a key. When \fIunset\fP, Madmutt will wait
    ** for a key only if the external command returned a non-zero status.
    */
-  {"weed", DT_BOOL, R_NONE, OPTWEED, "yes" },
+  {"weed", DT_BOOL, OPTWEED, "yes" },
   /*
    ** .pp
    ** When \fIset\fP, Madmutt will weed headers when displaying, forwarding,
    ** printing, or replying to messages.
    */
-  {"wrap_search", DT_BOOL, R_NONE, OPTWRAPSEARCH, "yes" },
+  {"wrap_search", DT_BOOL, OPTWRAPSEARCH, "yes" },
   /*
    ** .pp
    ** Controls whether searches wrap around the end of the mailbox.
@@ -1901,13 +1887,13 @@ struct option_t MuttVars[] = {
    ** When \fIset\fP, searches will wrap around the first (or last) message. When
    ** \fIunset\fP, searches will not wrap.
    */
-  {"wrapmargin", DT_NUM, R_PAGER, UL &WrapMargin, "0" },
+  {"wrapmargin", DT_NUM, UL &WrapMargin, "0" },
   /*
    ** .pp
    ** Controls the size of the margin remaining at the right side of
    ** the terminal when Madmutt's pager does smart wrapping.
    */
-  {"write_inc", DT_NUM, R_NONE, UL &WriteInc, "10" },
+  {"write_inc", DT_NUM, UL &WriteInc, "10" },
   /*
    ** .pp
    ** When writing a mailbox, a message will be printed every
@@ -1916,27 +1902,27 @@ struct option_t MuttVars[] = {
    ** .pp
    ** Also see the ``$$read_inc'' variable.
    */
-  {"write_bcc", DT_BOOL, R_NONE, OPTWRITEBCC, "yes" },
+  {"write_bcc", DT_BOOL, OPTWRITEBCC, "yes" },
   /*
    ** .pp
    ** Controls whether Madmutt writes out the Bcc header when preparing
    ** messages to be sent.  Exim users may wish to \fIunset\fP this.
    */
-  {"xterm_icon", DT_STR, R_BOTH, UL &XtermIcon, "M%?n?AIL&ail?"},
+  {"xterm_icon", DT_STR, UL &XtermIcon, "M%?n?AIL&ail?"},
   /*
    ** .pp
    ** Controls the format of the X11 icon title, as long as $$xterm_set_titles
    ** is \fIset\fP. This string is identical in formatting to the one used by
    ** ``$$status_format''.
    */
-  {"xterm_set_titles", DT_BOOL, R_BOTH, OPTXTERMSETTITLES, "no" },
+  {"xterm_set_titles", DT_BOOL, OPTXTERMSETTITLES, "no" },
   /*
    ** .pp
    ** Controls whether Madmutt sets the xterm title bar and icon name
    ** (as long as you're in an appropriate terminal). The default must
    ** be \fIunset\fP to force in the validity checking.
    */
-  {"xterm_leave", DT_STR, R_BOTH, UL &XtermLeave, "" },
+  {"xterm_leave", DT_STR, UL &XtermLeave, "" },
   /*
    ** .pp
    ** If $$xterm_set_titles is \fIset\fP, this string will be used to
@@ -1950,7 +1936,7 @@ struct option_t MuttVars[] = {
    ** .pp
    ** \fTset xterm_leave = "`test x$$$DISPLAY != x && xprop -id $$$WINDOWID | grep WM_NAME | cut -d '"' -f 2`"\fP
    */
-  {"xterm_title", DT_STR, R_BOTH, UL &XtermTitle, "Madmutt with %?m?%m messages&no messages?%?n? [%n New]?"},
+  {"xterm_title", DT_STR, UL &XtermTitle, "Madmutt with %?m?%m messages&no messages?%?n? [%n New]?"},
   /*
    ** .pp
    ** Controls the format of the title bar of the xterm provided that
@@ -1958,7 +1944,7 @@ struct option_t MuttVars[] = {
    ** to the one used by ``$$status_format''.
    */
 #ifdef USE_NNTP
-  {"nntp_post_moderated", DT_QUAD, R_NONE, OPT_TOMODERATED, "ask-yes" },
+  {"nntp_post_moderated", DT_QUAD, OPT_TOMODERATED, "ask-yes" },
   /*
    ** .pp
    ** Availability: NNTP
@@ -1971,7 +1957,7 @@ struct option_t MuttVars[] = {
    ** does not support posting to that newsgroup or a group is totally read-only, that
    ** posting will not have any effect.
    */
-  {"nntp_host", DT_STR, R_NONE, UL &NewsServer, "" },
+  {"nntp_host", DT_STR, UL &NewsServer, "" },
   /*
    ** .pp
    ** Availability: NNTP
@@ -1992,7 +1978,7 @@ struct option_t MuttVars[] = {
    ** presents a security risk since the superuser of your machine may read it
    ** regardless of the file's permissions.
    */
-  {"nntp_context", DT_NUM, R_NONE, UL &NntpContext, "1000" },
+  {"nntp_context", DT_NUM, UL &NntpContext, "1000" },
   /*
    ** .pp
    ** Availability: NNTP
@@ -2005,7 +1991,7 @@ struct option_t MuttVars[] = {
    ** If there're more articles than defined with $$nntp_context, all older ones
    ** will be removed/not shown in the index.
    */
-  {"nntp_load_description", DT_BOOL, R_NONE, OPTLOADDESC, "yes" },
+  {"nntp_load_description", DT_BOOL, OPTLOADDESC, "yes" },
   /*
    ** .pp
    ** Availability: NNTP
@@ -2014,7 +2000,7 @@ struct option_t MuttVars[] = {
    ** This variable controls whether or not descriptions for newsgroups
    ** are to be loaded when subscribing to a newsgroup.
    */
-  {"nntp_user", DT_STR, R_NONE, UL &NntpUser, ""},
+  {"nntp_user", DT_STR, UL &NntpUser, ""},
   /*
    ** .pp
    ** Availability: NNTP
@@ -2023,7 +2009,7 @@ struct option_t MuttVars[] = {
    ** Your login name on the NNTP server.  If \fIunset\fP and the server requires
    ** authentification, Madmutt will prompt you for your account name.
    */
-  {"nntp_pass", DT_STR, R_NONE, UL &NntpPass, ""},
+  {"nntp_pass", DT_STR, UL &NntpPass, ""},
   /*
    ** .pp
    ** Availability: NNTP
@@ -2035,7 +2021,7 @@ struct option_t MuttVars[] = {
    ** presents a security risk since the superuser of your machine may read it
    ** regardless of the file's permissions.
    */
-  {"nntp_mail_check", DT_NUM, R_NONE, UL &NewsPollTimeout, "60" },
+  {"nntp_mail_check", DT_NUM, UL &NewsPollTimeout, "60" },
   /*
    ** .pp
    ** Availability: NNTP
@@ -2045,7 +2031,7 @@ struct option_t MuttVars[] = {
    ** article will cause a recheck for new news. If set to 0, Madmutt will
    ** recheck on each operation in index (stepping, read article, etc.).
    */
-  {"nntp_reconnect", DT_QUAD, R_NONE, OPT_NNTPRECONNECT, "ask-yes" },
+  {"nntp_reconnect", DT_QUAD, OPT_NNTPRECONNECT, "ask-yes" },
   /*
    ** .pp
    ** Availability: NNTP
@@ -2054,7 +2040,7 @@ struct option_t MuttVars[] = {
    ** Controls whether or not Madmutt will try to reconnect to a newsserver when the
    ** was connection lost.
    */
-  {"nntp_group_index_format", DT_STR, R_BOTH, UL &GroupFormat, "%4C %M%N %5s  %-45.45f %d"},
+  {"nntp_group_index_format", DT_STR, UL &GroupFormat, "%4C %M%N %5s  %-45.45f %d"},
   /*
    ** .pp
    ** Availability: NNTP
@@ -2076,7 +2062,7 @@ struct option_t MuttVars[] = {
    ** %|X     pad to the end of the line with character "X"
    ** .te
    */
-  {"nntp_followup_to_poster", DT_QUAD, R_NONE, OPT_FOLLOWUPTOPOSTER, "ask-yes" },
+  {"nntp_followup_to_poster", DT_QUAD, OPT_FOLLOWUPTOPOSTER, "ask-yes" },
   /*
    ** .pp
    ** Availability: NNTP
@@ -2087,7 +2073,7 @@ struct option_t MuttVars[] = {
    ** permitted.  The message will be mailed to the submitter of the
    ** message via mail.
    */
-  {"nntp_catchup", DT_QUAD, R_NONE, OPT_CATCHUP, "ask-yes" },
+  {"nntp_catchup", DT_QUAD, OPT_CATCHUP, "ask-yes" },
   /*
    ** .pp
    ** Availability: NNTP
@@ -2096,7 +2082,7 @@ struct option_t MuttVars[] = {
    ** If this variable is \fIset\fP, Madmutt will mark all articles in a newsgroup
    ** as read when you leaving it.
    */
-  {"nntp_ask_followup_to", DT_BOOL, R_NONE, OPTASKFOLLOWUP, "no" },
+  {"nntp_ask_followup_to", DT_BOOL, OPTASKFOLLOWUP, "no" },
   /*
    ** .pp
    ** Availability: NNTP
@@ -2105,7 +2091,7 @@ struct option_t MuttVars[] = {
    ** If \fIset\fP, Madmutt will prompt you for the \fTFollowup-To:\fP header
    ** field before editing the body of an outgoing news article.
    */
-  {"nntp_show_new_news", DT_BOOL, R_NONE, OPTSHOWNEWNEWS, "yes" },
+  {"nntp_show_new_news", DT_BOOL, OPTSHOWNEWNEWS, "yes" },
   /*
    ** .pp
    ** Availability: NNTP
@@ -2116,7 +2102,7 @@ struct option_t MuttVars[] = {
    ** Also controls whether or not the number of new articles of subscribed
    ** newsgroups will be checked.
    */
-  {"nntp_show_only_unread", DT_BOOL, R_NONE, OPTSHOWONLYUNREAD, "no" },
+  {"nntp_show_only_unread", DT_BOOL, OPTSHOWONLYUNREAD, "no" },
   /*
    ** .pp
    ** Availability: NNTP
@@ -2127,7 +2113,7 @@ struct option_t MuttVars[] = {
    */
 #endif
   /*--*/
-  { NULL, -1, R_NONE, -1, NULL }
+  { NULL, -1, -1, NULL }
 };
 
 const struct mapping_t SortMethods[] = {