Rename pgp_mime_ask to pgp_mime_auto; change the default; change the

error message given if that variable is set to "no."

diff --git a/crypt.c b/crypt.c
index f50842f25244a49c1cf649d404414709e9ecbe9f..fe5dc2c4de70ea365123f0518c07fba19056716e 100644 (file)
--- a/crypt.c
+++ b/crypt.c
@@ -185,8 +185,11 @@ int mutt_protect (HEADER *msg, char *keylist)
     }
 
     /* otherwise inline won't work...ask for revert */
-    if ((i = query_quadoption (OPT_PGPMIMEASK, _("Message can't be sent inline.  Revert to using PGP/MIME?"))) != M_YES)
-      return -1;
+    if ((i = query_quadoption (OPT_PGPMIMEAUTO, _("Message can't be sent inline.  Revert to using PGP/MIME?"))) != M_YES)
+      {
+       mutt_error _("Mail not sent.");
+       return -1;
+      }
 
     /* go ahead with PGP/MIME */
   }

diff --git a/init.h b/init.h
index e7d4454f5fec8f8e7877b5d0c3ae40b8169459e6..781dbcd5d2a1fe9eea4b6eb6e68ed74ba85b1901 100644 (file)
--- a/init.h
+++ b/init.h
@@ -1391,7 +1391,7 @@ struct option_t MuttVars[] = {
   ** which consist of more than a single MIME part.  Mutt can be
   ** configured to ask before sending PGP/MIME messages when inline
   ** (traditional) would not work.
-  ** See also: ``$$pgp_mime_ask''.
+  ** See also: ``$$pgp_mime_auto''.
   ** .pp
   ** Also note that using the old-style PGP message format is \fBstrongly\fP
   ** \fBdeprecated\fP.
@@ -1413,7 +1413,7 @@ struct option_t MuttVars[] = {
   ** which consist of more than a single MIME part.  Mutt can be
   ** configured to ask before sending PGP/MIME messages when inline
   ** (traditional) would not work.
-  ** See also: ``$$pgp_mime_ask''.
+  ** See also: ``$$pgp_mime_auto''.
   ** .pp
   ** Also note that using the old-style PGP message format is \fBstrongly\fP
   ** \fBdeprecated\fP.
@@ -1469,7 +1469,7 @@ struct option_t MuttVars[] = {
   ** `reverse-'.
   ** (PGP only)
   */
-  { "pgp_mime_ask", DT_QUAD, R_NONE, OPT_PGPMIMEASK, M_NO },
+  { "pgp_mime_auto", DT_QUAD, R_NONE, OPT_PGPMIMEAUTO, M_ASKYES },
   /*
   ** .pp
   ** This option controls whether Mutt will prompt you for

diff --git a/mutt.h b/mutt.h
index c381c8032f5fa6979b6a5f819e91c1d2a4f6520d..3dfe27d67485b46c7902b8275e6a38d66f4ccad9 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -278,7 +278,7 @@ enum
   OPT_MIMEFWD,
   OPT_MIMEFWDREST,
   OPT_MOVE,
-  OPT_PGPMIMEASK,     /* ask to revert to PGP/MIME when inline fails */
+  OPT_PGPMIMEAUTO,     /* ask to revert to PGP/MIME when inline fails */
 #ifdef USE_POP
   OPT_POPDELETE,
   OPT_POPRECONNECT,