From 3c443e990f933409ab6ab01a5a20097ad86929fd Mon Sep 17 00:00:00 2001 From: Jeremy Compostella Date: Sat, 14 Mar 2020 12:44:55 +0100 Subject: [PATCH] Make previous mml-expand-html-into-multipart-related fix more general * lisp/gnus/mml.el (mml-expand-html-into-multipart-related): This is function is now called by a recursive engine (mml-expand-all-html-into-multipart-related). The structure of the returned value should be identical between an untouched part and a expanded multipart (bug#39230). --- lisp/gnus/mml.el | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el index 3d86c5bc407..2006837d6a7 100644 --- a/lisp/gnus/mml.el +++ b/lisp/gnus/mml.el @@ -547,8 +547,7 @@ type detected." new-parts)) (setq cid (1+ cid))))))) ;; We have local images that we want to include. - (if (not new-parts) - (list cont) + (when new-parts (setcdr (assq 'contents cont) (buffer-string)) (setq cont (nconc (list 'multipart (cons 'type "related")) @@ -561,8 +560,8 @@ type detected." (nth 1 new-part) (nth 2 new-part)) (id . ,(concat "<" (nth 0 new-part) - ">"))))))) - cont)))) + ">")))))))) + cont))) (autoload 'image-property "image") -- 2.39.2