From 9ba72c76cbd2fd1b05514fa14803c35e9a73e7c4 Mon Sep 17 00:00:00 2001 From: Kevin McCarthy Date: Fri, 8 Mar 2019 19:48:41 +0800 Subject: [PATCH] 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 --- rfc1524.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- 2.50.0