rename: global quad variables (insert underscores)

Rename constants for better legibility, such as:
    OPT_PGPENCRYPTSELF -> OPT_PGP_ENCRYPT_SELF

diff --git a/commands.c b/commands.c
index 77a4243c23d552e4141a4d2d561afb64a3e72cac..6ebb46db6cd5ff995b4c5ffa109c3725afa7879a 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -102,7 +102,7 @@ int mutt_display_message(struct Header *cur)
     else if (cur->security & SIGN)
     {
       /* find out whether or not the verify signature */
-      if (query_quadoption(OPT_VERIFYSIG, _("Verify PGP signature?")) == MUTT_YES)
+      if (query_quadoption(OPT_VERIFY_SIG, _("Verify PGP signature?")) == MUTT_YES)
       {
         cmflags |= MUTT_CM_VERIFY;
       }

diff --git a/curs_main.c b/curs_main.c
index 855a76d8c910b47ec30d870d959fcd6fd11903f7..c387182339bef764efc282b5c703ed5916c747a4 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -3100,11 +3100,11 @@ int mutt_index_menu(void)
         CHECK_ATTACH;
         if (op != OP_FOLLOWUP || !CURHDR->env->followup_to ||
             (mutt_strcasecmp(CURHDR->env->followup_to, "poster") != 0) ||
-            query_quadoption(OPT_FOLLOWUPTOPOSTER,
+            query_quadoption(OPT_FOLLOW_UP_TO_POSTER,
                              _("Reply by mail as poster prefers?")) != MUTT_YES)
         {
           if (Context && Context->magic == MUTT_NNTP &&
-              !((struct NntpData *) Context->data)->allowed && query_quadoption(OPT_TOMODERATED, _("Posting to this group not allowed, may be moderated. Continue?")) != MUTT_YES)
+              !((struct NntpData *) Context->data)->allowed && query_quadoption(OPT_TO_MODERATED, _("Posting to this group not allowed, may be moderated. Continue?")) != MUTT_YES)
             break;
           if (op == OP_POST)
             ci_send_message(SENDNEWS, NULL, NULL, Context, NULL);

diff --git a/globals.h b/globals.h
index 7e1bf4626dfd078678e4bff53e9439e47e09f6e7..4f530cd4cba571bfd4f0afbda119d13cb5e74d52 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -225,7 +225,7 @@ WHERE struct ReplaceList *SubjectRxList;
 
 /* bit vector for the yes/no/ask variable type */
 #ifdef MAIN_C
-unsigned char QuadOptions[(OPT_MAX * 2 + 7) / 8];
+unsigned char QuadOptions[(OPT_QUAD_MAX * 2 + 7) / 8];
 #else
 extern unsigned char QuadOptions[];
 #endif

diff --git a/imap/imap.c b/imap/imap.c
index 98937e2cea449ad8549c3c627d4c7801818ca9e4..b906ca28351768956a4c5082939f196cefa6fb90 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -474,7 +474,7 @@ int imap_open_connection(struct ImapData *idata)
 
       if (option(OPT_SSL_FORCE_TLS))
         rc = MUTT_YES;
-      else if ((rc = query_quadoption(OPT_SSLSTARTTLS,
+      else if ((rc = query_quadoption(OPT_SSL_START_TLS,
                                       _("Secure connection with TLS?"))) == MUTT_ABORT)
         goto err_close_conn;
       if (rc == MUTT_YES)

diff --git a/init.h b/init.h
index 8e90add80c7169d821c93b1be734bc4b91440f5c..6f1c82b48a645b7a9260dd1125eb15c6fb68538d 100644 (file)
--- a/init.h
+++ b/init.h
@@ -641,7 +641,7 @@ struct Option MuttVars[] = {
   ** verification (only supported by the GPGME backend).
   */
   { "pgp_verify_sig",   DT_SYN,  R_NONE, UL "crypt_verify_sig", 0 },
-  { "crypt_verify_sig", DT_QUAD, R_NONE, OPT_VERIFYSIG, MUTT_YES },
+  { "crypt_verify_sig", DT_QUAD, R_NONE, OPT_VERIFY_SIG, MUTT_YES },
   /*
   ** .pp
   ** If \fI``yes''\fP, always attempt to verify PGP or S/MIME signatures.
@@ -852,7 +852,7 @@ struct Option MuttVars[] = {
   ** \fBNote:\fP this variable has no effect when the $$autoedit
   ** variable is \fIset\fP.
   */
-  { "fcc_attach",       DT_QUAD, R_NONE, OPT_FCCATTACH, MUTT_YES },
+  { "fcc_attach",       DT_QUAD, R_NONE, OPT_FCC_ATTACH, MUTT_YES },
   /*
   ** .pp
   ** This variable controls whether or not attachments on outgoing messages
@@ -938,7 +938,7 @@ struct Option MuttVars[] = {
   ** of the same email for you.
   */
 #ifdef USE_NNTP
-  { "followup_to_poster", DT_QUAD, R_NONE, OPT_FOLLOWUPTOPOSTER, MUTT_ASKYES },
+  { "followup_to_poster", DT_QUAD, R_NONE, OPT_FOLLOW_UP_TO_POSTER, MUTT_ASKYES },
   /*
   ** .pp
   ** If this variable is \fIset\fP and the keyword "poster" is present in
@@ -995,7 +995,7 @@ struct Option MuttVars[] = {
   { "forw_decrypt",     DT_SYN,  R_NONE, UL "forward_decrypt", 0 },
   /*
   */
-  { "forward_edit",     DT_QUAD, R_NONE, OPT_FORWEDIT, MUTT_YES },
+  { "forward_edit",     DT_QUAD, R_NONE, OPT_FORW_EDIT, MUTT_YES },
   /*
   ** .pp
   ** This quadoption controls whether or not the user is automatically
@@ -1253,7 +1253,7 @@ struct Option MuttVars[] = {
   ** If \fIunset\fP, Mutt will render all MIME parts it can
   ** properly transform to plain text.
   */
-  { "honor_followup_to", DT_QUAD, R_NONE, OPT_MFUPTO, MUTT_YES },
+  { "honor_followup_to", DT_QUAD, R_NONE, OPT_MF_UP_TO, MUTT_YES },
   /*
   ** .pp
   ** This variable controls whether or not a Mail-Followup-To header is
@@ -1875,7 +1875,7 @@ struct Option MuttVars[] = {
   ** .pp
   ** The name of the MH sequence used for unseen messages.
   */
-  { "mime_forward",     DT_QUAD, R_NONE, OPT_MIMEFWD, MUTT_NO },
+  { "mime_forward",     DT_QUAD, R_NONE, OPT_MIME_FWD, MUTT_NO },
   /*
   ** .pp
   ** When \fIset\fP, the message you are forwarding will be attached as a
@@ -1897,7 +1897,7 @@ struct Option MuttVars[] = {
   { "mime_fwd",         DT_SYN,  R_NONE, UL "mime_forward", 0 },
   /*
   */
-  { "mime_forward_rest", DT_QUAD, R_NONE, OPT_MIMEFWDREST, MUTT_YES },
+  { "mime_forward_rest", DT_QUAD, R_NONE, OPT_MIME_FWD_REST, MUTT_YES },
   /*
   ** .pp
   ** When forwarding multiple attachments of a MIME message from the attachment
@@ -2426,7 +2426,7 @@ struct Option MuttVars[] = {
   ** in the key selection menu and a few other places.
   ** (PGP only)
   */
-  { "pgp_mime_auto", DT_QUAD, R_NONE, OPT_PGPMIMEAUTO, MUTT_ASKYES },
+  { "pgp_mime_auto", DT_QUAD, R_NONE, OPT_PGP_MIME_AUTO, MUTT_ASKYES },
   /*
   ** .pp
   ** This option controls whether Mutt will prompt you for
@@ -2627,7 +2627,7 @@ struct Option MuttVars[] = {
   ** This variable configures how often (in seconds) mutt should look for
   ** new mail in the currently selected mailbox if it is a POP mailbox.
   */
-  { "pop_delete",       DT_QUAD, R_NONE, OPT_POPDELETE, MUTT_ASKNO },
+  { "pop_delete",       DT_QUAD, R_NONE, OPT_POP_DELETE, MUTT_ASKNO },
   /*
   ** .pp
   ** If \fIset\fP, Mutt will delete successfully downloaded messages from the POP
@@ -2662,7 +2662,7 @@ struct Option MuttVars[] = {
   ** fairly secure machine, because the superuser can read your muttrc
   ** even if you are the only one who can read the file.
   */
-  { "pop_reconnect",    DT_QUAD, R_NONE, OPT_POPRECONNECT, MUTT_ASKYES },
+  { "pop_reconnect",    DT_QUAD, R_NONE, OPT_POP_RECONNECT, MUTT_ASKYES },
   /*
   ** .pp
   ** Controls whether or not Mutt will try to reconnect to the POP server if
@@ -2686,7 +2686,7 @@ struct Option MuttVars[] = {
   /*
   */
 #ifdef USE_NNTP
-  { "post_moderated",   DT_QUAD, R_NONE, OPT_TOMODERATED, MUTT_ASKYES },
+  { "post_moderated",   DT_QUAD, R_NONE, OPT_TO_MODERATED, MUTT_ASKYES },
   /*
   ** .pp
   ** If set to \fIyes\fP, Mutt will post article to newsgroup that have
@@ -2951,7 +2951,7 @@ struct Option MuttVars[] = {
   ** .pp
   ** Also see the ``$alternates'' command.
   */
-  { "reply_to",         DT_QUAD, R_NONE, OPT_REPLYTO, MUTT_ASKYES },
+  { "reply_to",         DT_QUAD, R_NONE, OPT_REPLY_TO, MUTT_ASKYES },
   /*
   ** .pp
   ** If \fIset\fP, when replying to a message, Mutt will use the address listed
@@ -3831,7 +3831,7 @@ struct Option MuttVars[] = {
   ** the default from the GNUTLS library.
   */
 # endif /* USE_SSL_GNUTLS */
-  { "ssl_starttls", DT_QUAD, R_NONE, OPT_SSLSTARTTLS, MUTT_YES },
+  { "ssl_starttls", DT_QUAD, R_NONE, OPT_SSL_START_TLS, MUTT_YES },
   /*
   ** .pp
   ** If \fIset\fP (the default), mutt will attempt to use \fCSTARTTLS\fP on servers
@@ -4400,8 +4400,8 @@ struct Option MuttVars[] = {
   ** When \fIset\fP, Mutt will collapse all threads when entering a folder.
   */
   /*--*/
-  { "pgp_encrypt_self",   DT_QUAD, R_NONE, OPT_PGPENCRYPTSELF,   MUTT_NO },
-  { "smime_encrypt_self", DT_QUAD, R_NONE, OPT_SMIMEENCRYPTSELF, MUTT_NO },
+  { "pgp_encrypt_self",   DT_QUAD, R_NONE, OPT_PGP_ENCRYPT_SELF,   MUTT_NO },
+  { "smime_encrypt_self", DT_QUAD, R_NONE, OPT_SMIME_ENCRYPT_SELF, MUTT_NO },
   { NULL, 0, 0, 0, 0 },
 };
 

diff --git a/mutt.h b/mutt.h
index 4c7ac3e1cf429ed80e1f65d8a3797cc057edd28d..683604b6abd90a40e48f1e91e6cd9468d2c1d355 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -251,38 +251,38 @@ enum QuadOptionVars
   OPT_BOUNCE,
   OPT_COPY,
   OPT_DELETE,
-  OPT_FORWEDIT,
-  OPT_FCCATTACH,
+  OPT_FORW_EDIT,
+  OPT_FCC_ATTACH,
   OPT_INCLUDE,
-  OPT_MFUPTO,
-  OPT_MIMEFWD,
-  OPT_MIMEFWDREST,
+  OPT_MF_UP_TO,
+  OPT_MIME_FWD,
+  OPT_MIME_FWD_REST,
   OPT_MOVE,
-  OPT_PGPMIMEAUTO, /* ask to revert to PGP/MIME when inline fails */
-  OPT_SMIMEENCRYPTSELF,
-  OPT_PGPENCRYPTSELF,
+  OPT_PGP_MIME_AUTO, /* ask to revert to PGP/MIME when inline fails */
+  OPT_SMIME_ENCRYPT_SELF,
+  OPT_PGP_ENCRYPT_SELF,
 #ifdef USE_POP
-  OPT_POPDELETE,
-  OPT_POPRECONNECT,
+  OPT_POP_DELETE,
+  OPT_POP_RECONNECT,
 #endif
   OPT_POSTPONE,
   OPT_PRINT,
   OPT_QUIT,
-  OPT_REPLYTO,
+  OPT_REPLY_TO,
   OPT_RECALL,
 #ifdef USE_SSL
-  OPT_SSLSTARTTLS,
+  OPT_SSL_START_TLS,
 #endif
   OPT_SUBJECT,
-  OPT_VERIFYSIG, /* verify PGP signatures */
+  OPT_VERIFY_SIG, /* verify PGP signatures */
 #ifdef USE_NNTP
-  OPT_TOMODERATED,
+  OPT_TO_MODERATED,
   OPT_CATCHUP,
-  OPT_FOLLOWUPTOPOSTER,
+  OPT_FOLLOW_UP_TO_POSTER,
 #endif
   OPT_ATTACH, /* forgotten attachment detector */
   /* THIS MUST BE THE LAST VALUE. */
-  OPT_MAX
+  OPT_QUAD_MAX,
 };
 
 /* flags to ci_send_message() */

diff --git a/ncrypt/crypt.c b/ncrypt/crypt.c
index ed1b9f4eadf2a699d5a52d03851c696a7058f7ac..d858d13ab395dabcb729c602ed247fbae97c1ab7 100644 (file)
--- a/ncrypt/crypt.c
+++ b/ncrypt/crypt.c
@@ -151,7 +151,7 @@ int mutt_protect(struct Header *msg, char *keylist)
     if ((msg->content->type != TYPETEXT) ||
         (ascii_strcasecmp(msg->content->subtype, "plain") != 0))
     {
-      if (query_quadoption(OPT_PGPMIMEAUTO,
+      if (query_quadoption(OPT_PGP_MIME_AUTO,
                            _("Inline PGP can't be used with attachments.  "
                              "Revert to PGP/MIME?")) != MUTT_YES)
       {
@@ -174,7 +174,7 @@ int mutt_protect(struct Header *msg, char *keylist)
 
       /* otherwise inline won't work...ask for revert */
       if (query_quadoption(
-              OPT_PGPMIMEAUTO,
+              OPT_PGP_MIME_AUTO,
               _("Message can't be sent inline.  Revert to using PGP/MIME?")) != MUTT_YES)
       {
         mutt_error(_("Mail not sent."));
@@ -836,7 +836,7 @@ int crypt_get_keys(struct Header *msg, char **keylist, int oppenc_mode)
         return -1;
       }
       unset_option(OPT_PGP_CHECK_TRUST);
-      if (option(OPT_PGP_SELF_ENCRYPT) || (quadoption(OPT_PGPENCRYPTSELF) == MUTT_YES))
+      if (option(OPT_PGP_SELF_ENCRYPT) || (quadoption(OPT_PGP_ENCRYPT_SELF) == MUTT_YES))
         self_encrypt = PgpSelfEncryptAs;
     }
     if ((WithCrypto & APPLICATION_SMIME) && (msg->security & APPLICATION_SMIME))
@@ -846,7 +846,7 @@ int crypt_get_keys(struct Header *msg, char **keylist, int oppenc_mode)
         rfc822_free_address(&adrlist);
         return -1;
       }
-      if (option(OPT_SMIME_SELF_ENCRYPT) || (quadoption(OPT_SMIMEENCRYPTSELF) == MUTT_YES))
+      if (option(OPT_SMIME_SELF_ENCRYPT) || (quadoption(OPT_SMIME_ENCRYPT_SELF) == MUTT_YES))
         self_encrypt = SmimeSelfEncryptAs;
     }
   }

diff --git a/nntp.c b/nntp.c
index 4ace600e1630843b7b85342b5a208ce45119b102..d98d54410a9ab01966bf5620fdf5176b908006e8 100644 (file)
--- a/nntp.c
+++ b/nntp.c
@@ -671,7 +671,7 @@ int nntp_open_connection(struct NntpServer *nserv)
     if (nserv->use_tls == 0)
       nserv->use_tls =
           option(OPT_SSL_FORCE_TLS) ||
-                  query_quadoption(OPT_SSLSTARTTLS,
+                  query_quadoption(OPT_SSL_START_TLS,
                                    _("Secure connection with TLS?")) == MUTT_YES ?
               2 :
               1;

diff --git a/pager.c b/pager.c
index 20ed7adb5a05c08996981eb0de9b5840c6340de3..9071bdeb2680d9eab975e5e47d48abb9718380d8 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -2874,7 +2874,7 @@ int mutt_pager(const char *banner, const char *fname, int flags, struct Pager *e
         CHECK_MODE(IsHeader(extra) && !IsAttach(extra));
         CHECK_ATTACH;
         if (extra->ctx && extra->ctx->magic == MUTT_NNTP &&
-            !((struct NntpData *) extra->ctx->data)->allowed && query_quadoption(OPT_TOMODERATED, _("Posting to this group not allowed, may be moderated. Continue?")) != MUTT_YES)
+            !((struct NntpData *) extra->ctx->data)->allowed && query_quadoption(OPT_TO_MODERATED, _("Posting to this group not allowed, may be moderated. Continue?")) != MUTT_YES)
           break;
         ci_send_message(SENDNEWS, NULL, NULL, extra->ctx, NULL);
         pager_menu->redraw = REDRAW_FULL;
@@ -2884,7 +2884,7 @@ int mutt_pager(const char *banner, const char *fname, int flags, struct Pager *e
         CHECK_MODE(IsHeader(extra) || IsMsgAttach(extra));
         CHECK_ATTACH;
         if (extra->ctx && extra->ctx->magic == MUTT_NNTP &&
-            !((struct NntpData *) extra->ctx->data)->allowed && query_quadoption(OPT_TOMODERATED, _("Posting to this group not allowed, may be moderated. Continue?")) != MUTT_YES)
+            !((struct NntpData *) extra->ctx->data)->allowed && query_quadoption(OPT_TO_MODERATED, _("Posting to this group not allowed, may be moderated. Continue?")) != MUTT_YES)
           break;
         if (IsMsgAttach(extra))
           mutt_attach_forward(extra->fp, extra->hdr, extra->idx, extra->idxlen,
@@ -2904,11 +2904,11 @@ int mutt_pager(const char *banner, const char *fname, int flags, struct Pager *e
           followup_to = extra->hdr->env->followup_to;
 
         if (!followup_to || (mutt_strcasecmp(followup_to, "poster") != 0) ||
-            query_quadoption(OPT_FOLLOWUPTOPOSTER,
+            query_quadoption(OPT_FOLLOW_UP_TO_POSTER,
                              _("Reply by mail as poster prefers?")) != MUTT_YES)
         {
           if (extra->ctx && extra->ctx->magic == MUTT_NNTP &&
-              !((struct NntpData *) extra->ctx->data)->allowed && query_quadoption(OPT_TOMODERATED, _("Posting to this group not allowed, may be moderated. Continue?")) != MUTT_YES)
+              !((struct NntpData *) extra->ctx->data)->allowed && query_quadoption(OPT_TO_MODERATED, _("Posting to this group not allowed, may be moderated. Continue?")) != MUTT_YES)
             break;
           if (IsMsgAttach(extra))
             mutt_attach_reply(extra->fp, extra->hdr, extra->idx, extra->idxlen,

diff --git a/pop.c b/pop.c
index f5b023e6bbe6003df690e01a03dd748607b18b0b..060baadb722f4b8890f9fe18a12a7161bd74aea6 100644 (file)
--- a/pop.c
+++ b/pop.c
@@ -893,7 +893,7 @@ void pop_fetch_mail(void)
     goto finish;
 
   delanswer =
-      query_quadoption(OPT_POPDELETE, _("Delete messages from server?"));
+      query_quadoption(OPT_POP_DELETE, _("Delete messages from server?"));
 
   snprintf(msgbuf, sizeof(msgbuf), _("Reading new messages (%d bytes)..."), bytes);
   mutt_message("%s", msgbuf);

diff --git a/pop_lib.c b/pop_lib.c
index 28c7dba859537324cd856cd828d4c9dd31ed43c7..4c021ebbeafd53d881aadd79ea131500d0d1adf8 100644 (file)
--- a/pop_lib.c
+++ b/pop_lib.c
@@ -326,7 +326,7 @@ int pop_open_connection(struct PopData *pop_data)
       pop_data->use_stls = 2;
     if (pop_data->use_stls == 0)
     {
-      ret = query_quadoption(OPT_SSLSTARTTLS, _("Secure connection with TLS?"));
+      ret = query_quadoption(OPT_SSL_START_TLS, _("Secure connection with TLS?"));
       if (ret == MUTT_ABORT)
         return -2;
       pop_data->use_stls = 1;
@@ -645,7 +645,7 @@ int pop_reconnect(struct Context *ctx)
     if (ret < -1)
       return -1;
 
-    if (query_quadoption(OPT_POPRECONNECT,
+    if (query_quadoption(OPT_POP_RECONNECT,
                          _("Connection lost. Reconnect to POP server?")) != MUTT_YES)
       return -1;
   }

diff --git a/recvattach.c b/recvattach.c
index 82d3c7b9cb02051acb7ef33c8ec7ff1142049e94..38532e0fd127dcf64f0234d0ff951d5a7391356b 100644 (file)
--- a/recvattach.c
+++ b/recvattach.c
@@ -1252,7 +1252,7 @@ void mutt_view_attachments(struct Header *hdr)
 
         if (!idx[menu->current]->content->hdr->env->followup_to ||
             (mutt_strcasecmp(idx[menu->current]->content->hdr->env->followup_to, "poster") != 0) ||
-            query_quadoption(OPT_FOLLOWUPTOPOSTER,
+            query_quadoption(OPT_FOLLOW_UP_TO_POSTER,
                              _("Reply by mail as poster prefers?")) != MUTT_YES)
         {
           mutt_attach_reply(fp, hdr, idx, idxlen,

diff --git a/recvcmd.c b/recvcmd.c
index 023b0734865cc9279696c081cfb173e4c2e9d897..037622551c73c654c1976bee33375234a39b5b31 100644 (file)
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -439,7 +439,7 @@ static void attach_forward_bodies(FILE *fp, struct Header *hdr,
    */
 
   if ((!cur || mutt_can_decode(cur)) &&
-      (rc = query_quadoption(OPT_MIMEFWD, _("Forward as attachments?"))) == MUTT_YES)
+      (rc = query_quadoption(OPT_MIME_FWD, _("Forward as attachments?"))) == MUTT_YES)
     mime_fwd_all = true;
   else if (rc == -1)
     goto bail;
@@ -451,7 +451,7 @@ static void attach_forward_bodies(FILE *fp, struct Header *hdr,
 
   if (!mime_fwd_all && !cur && (nattach > 1) && !check_can_decode(idx, idxlen, cur))
   {
-    if ((rc = query_quadoption(OPT_MIMEFWDREST,
+    if ((rc = query_quadoption(OPT_MIME_FWD_REST,
                                _("Can't decode all tagged attachments.  "
                                  "MIME-forward the others?"))) == MUTT_ABORT)
       goto bail;
@@ -573,7 +573,7 @@ static void attach_forward_msgs(FILE *fp, struct Header *hdr, struct AttachPtr *
 
   tmpbody[0] = '\0';
 
-  if ((rc = query_quadoption(OPT_MIMEFWD, _("Forward MIME encapsulated?"))) == MUTT_NO)
+  if ((rc = query_quadoption(OPT_MIME_FWD, _("Forward MIME encapsulated?"))) == MUTT_NO)
   {
     /* no MIME encapsulation */
 
@@ -810,7 +810,7 @@ void mutt_attach_reply(FILE *fp, struct Header *hdr, struct AttachPtr **idx,
 
   if (nattach > 1 && !check_can_decode(idx, idxlen, cur))
   {
-    if ((rc = query_quadoption(OPT_MIMEFWDREST,
+    if ((rc = query_quadoption(OPT_MIME_FWD_REST,
                                _("Can't decode all tagged attachments.  "
                                  "MIME-encapsulate the others?"))) == MUTT_ABORT)
       return;

diff --git a/send.c b/send.c
index fc9b61565c5833076785c155169bb1f44d04cdc2..734b56cf304a03033ce2ed612853c574f97adea1 100644 (file)
--- a/send.c
+++ b/send.c
@@ -579,7 +579,7 @@ static int default_to(struct Address **to, struct Envelope *env, int flags, int
       rfc822_append(to, env->from, 0);
     }
     else if (!(addrcmp(env->from, env->reply_to) && !env->reply_to->next) &&
-             quadoption(OPT_REPLYTO) != MUTT_YES)
+             quadoption(OPT_REPLY_TO) != MUTT_YES)
     {
       /* There are quite a few mailing lists which set the Reply-To:
        * header field to the list address, which makes it quite impossible
@@ -591,7 +591,7 @@ static int default_to(struct Address **to, struct Envelope *env, int flags, int
          If she says no, mutt will reply to the from header's address instead. */
       snprintf(prompt, sizeof(prompt), _("Reply to %s%s?"),
                env->reply_to->mailbox, env->reply_to->next ? ",..." : "");
-      switch (query_quadoption(OPT_REPLYTO, prompt))
+      switch (query_quadoption(OPT_REPLY_TO, prompt))
       {
         case MUTT_YES:
           rfc822_append(to, env->reply_to, 0);
@@ -626,7 +626,7 @@ int mutt_fetch_recips(struct Envelope *out, struct Envelope *in, int flags)
              in->mail_followup_to->mailbox,
              in->mail_followup_to->next ? ",..." : "");
 
-    if ((hmfupto = query_quadoption(OPT_MFUPTO, prompt)) == MUTT_ABORT)
+    if ((hmfupto = query_quadoption(OPT_MF_UP_TO, prompt)) == MUTT_ABORT)
       return -1;
   }
 
@@ -922,7 +922,7 @@ static int generate_body(FILE *tempfp, struct Header *msg, int flags,
   }
   else if (flags & SENDFORWARD)
   {
-    if ((i = query_quadoption(OPT_MIMEFWD, _("Forward as attachment?"))) == MUTT_YES)
+    if ((i = query_quadoption(OPT_MIME_FWD, _("Forward as attachment?"))) == MUTT_YES)
     {
       struct Body *last = msg->content;
 
@@ -1677,7 +1677,7 @@ int ci_send_message(int flags, struct Header *msg, char *tempfile,
      */
     if (!(flags & SENDKEY) &&
         ((flags & SENDFORWARD) == 0 || (option(OPT_EDIT_HDRS) && option(OPT_AUTO_EDIT)) ||
-         query_quadoption(OPT_FORWEDIT, _("Edit forwarded message?")) == MUTT_YES))
+         query_quadoption(OPT_FORW_EDIT, _("Edit forwarded message?")) == MUTT_YES))
     {
       /* If the this isn't a text message, look for a mailcap edit command */
       if (mutt_needs_mailcap(msg->content))
@@ -2088,7 +2088,7 @@ int ci_send_message(int flags, struct Header *msg, char *tempfile,
       msg->content = clear_content;
 
     /* check to see if the user wants copies of all attachments */
-    if (query_quadoption(OPT_FCCATTACH, _("Save attachments in Fcc?")) != MUTT_YES &&
+    if (query_quadoption(OPT_FCC_ATTACH, _("Save attachments in Fcc?")) != MUTT_YES &&
         msg->content->type == TYPEMULTIPART)
     {
       if (WithCrypto && (msg->security & (ENCRYPT | SIGN)) &&

diff --git a/smtp.c b/smtp.c
index 0c812b39cf4231d82502b68685e69e004a322f9d..b10e5a40f3d2b28da578fcb562dc4b709af73174 100644 (file)
--- a/smtp.c
+++ b/smtp.c
@@ -340,7 +340,7 @@ static int smtp_helo(struct Connection *conn)
     if (conn->account.flags & MUTT_ACCT_USER)
       Esmtp = 1;
 #ifdef USE_SSL
-    if (option(OPT_SSL_FORCE_TLS) || quadoption(OPT_SSLSTARTTLS) != MUTT_NO)
+    if (option(OPT_SSL_FORCE_TLS) || quadoption(OPT_SSL_START_TLS) != MUTT_NO)
       Esmtp = 1;
 #endif
   }
@@ -591,7 +591,7 @@ static int smtp_open(struct Connection *conn)
   else if (option(OPT_SSL_FORCE_TLS))
     rc = MUTT_YES;
   else if (mutt_bit_isset(Capabilities, STARTTLS) &&
-           (rc = query_quadoption(OPT_SSLSTARTTLS,
+           (rc = query_quadoption(OPT_SSL_START_TLS,
                                   _("Secure connection with TLS?"))) == MUTT_ABORT)
     return rc;