Check noconv for mailcap %{charset} send mode expansion.

Improve the previous commit by checking to make sure a->noconv also
isn't set.  If noconv is set, we ignore any value a->charset might
have picked up during previous encoding checks.

diff --git a/rfc1524.c b/rfc1524.c
index 2a9e3afd72a9f3d21d0f5df713f022dfd0875b44..e7755035f3bfa90d1d4da8f675cdd66e07722a47 100644 (file)
--- a/rfc1524.c
+++ b/rfc1524.c
@@ -104,7 +104,7 @@ int rfc1524_expand_command (BODY *a, const char *filename, const char *_type,
 
         /* In send mode, use the current charset, since the message hasn't
          * been converted yet. */
-        if ((ascii_strcasecmp (param, "charset") == 0) && a->charset)
+        if ((ascii_strcasecmp (param, "charset") == 0) && a->charset && !a->noconv)
           _pvalue = a->charset;
         else
           _pvalue = mutt_get_parameter (param, a->parameter);