From: Kevin McCarthy <kevin@8t8.us>
Date: Fri, 8 Mar 2019 11:48:41 +0000 (+0800)
Subject: Check noconv for mailcap %{charset} send mode expansion
X-Git-Tag: 2019-10-25~276^2~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9ba72c76cbd2fd1b05514fa14803c35e9a73e7c4;p=neomutt

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.

Co-authored-by: Richard Russon <rich@flatcap.org>
---

diff --git a/rfc1524.c b/rfc1524.c
index 0fd284951..2e3c082af 100644
--- a/rfc1524.c
+++ b/rfc1524.c
@@ -106,7 +106,7 @@ int rfc1524_expand_command(struct Body *a, const char *filename,
 
         /* In send mode, use the current charset, since the message hasn't
          * been converted yet. */
-        if ((mutt_str_strcasecmp(param, "charset") == 0) && a->charset)
+        if ((mutt_str_strcasecmp(param, "charset") == 0) && a->charset && !a->noconv)
           pvalue2 = a->charset;
         else
           pvalue2 = mutt_param_get(&a->parameter, param);