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).

diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index 3d86c5bc407233195168c219834d8a095e02242d..2006837d6a782c98633a2bba96885ed85c9a29cf 100644 (file)
--- 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")