X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=commands.c;h=2617f7ae61a0a7e0ee96bf2bc8d3361626cd2e51;hp=da633cb968680c5182b48108cc5947d066d8e96a;hb=ad303d5eab5c92f9546cc9d3703a24534d6bb5e0;hpb=ace94418088f9165d23763bd39752cc31b406f03

diff --git a/commands.c b/commands.c
index da633cb..2617f7a 100644
--- a/commands.c
+++ b/commands.c
@@ -86,7 +86,7 @@ int mutt_display_message (HEADER * cur)
       }
       else if (cur->security & SIGN) {
         /* find out whether or not the verify signature */
-        if (query_quadoption (OPT_VERIFYSIG, _("Verify PGP signature?")) ==
+        if (query_quadoption2(mod_crypt.verify_sig, _("Verify PGP signature?")) ==
             M_YES) {
           cmflags |= M_CM_VERIFY;
         }
@@ -204,11 +204,11 @@ void ci_bounce_message (HEADER * h, int *redraw)
   buf[0] = 0;
   rfc822_addrcat(buf, sizeof (buf), adr, 1);
 
-#define extra_space (15 + 7 + 2)
   snprintf (prompt, sizeof (prompt),
             (h ? _("Bounce message to %s") : _("Bounce messages to %s")),
             buf);
 
+#define extra_space (15 + 7 + 2)
   if (m_strwidth(prompt) > COLS - extra_space) {
     mutt_format_string(prompt, sizeof(prompt), 0, COLS - extra_space, 0, 0,
                        prompt, sizeof(prompt), 0);
@@ -216,6 +216,7 @@ void ci_bounce_message (HEADER * h, int *redraw)
   } else {
     m_strcat(prompt, sizeof(prompt), "?");
   }
+#undef extra_space
 
   if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
     address_list_wipe(&adr);
@@ -699,7 +700,7 @@ int mutt_save_message (HEADER * h, int delete,
       }
     }
 
-    need_buffy_cleanup = (ctx.magic == M_MBOX || ctx.magic == M_MMDF);
+    need_buffy_cleanup = (ctx.magic == M_MBOX);
 
     mx_close_mailbox (&ctx, NULL);