Work for empty MIME attachments (related to bug#34387)

* mm-view.el (mm-inline-text):
Make undisplayer do nothing if the part is empty.

* mm-decode.el (mm-copy-to-buffer): Work for empty MIME part.
* mml.el (mime-to-mml): Ditto.

diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 5dad2acbdd03d7f343c84e0ec74e475311c2697f..21552abae734e227e560699f47b3346ac997aaad 100644 (file)
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -764,7 +764,7 @@ MIME-Version header before proceeding."
         (mb (mm-multibyte-p))
         beg)
     (goto-char (point-min))
-    (search-forward-regexp "^\n" nil t)
+    (search-forward-regexp "^\n" nil 'move) ;; There might be no body.
     (setq beg (point))
     (with-current-buffer
           (generate-new-buffer " *mm*")

diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
index d588e9b9a877068d88844c70daf917506aaa86fb..03e1e11813f5faf08ac79395171c1e67be3dd453 100644 (file)
--- a/lisp/gnus/mm-view.el
+++ b/lisp/gnus/mm-view.el
@@ -368,10 +368,12 @@
          (enriched-decode (point-min) (point-max))))
       (mm-handle-set-undisplayer
        handle
-       `(lambda ()
-          (let ((inhibit-read-only t))
-           (delete-region ,(copy-marker (point-min) t)
-                          ,(point-max-marker))))))))
+       (if (= (point-min) (point-max))
+          #'ignore
+        `(lambda ()
+           (let ((inhibit-read-only t))
+             (delete-region ,(copy-marker (point-min) t)
+                            ,(point-max-marker)))))))))
 
 (defun mm-insert-inline (handle text)
   "Insert TEXT inline from HANDLE."

diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index f2b969a15b5122ec7086a3d148afb8efd4b0b77c..d5588971e599e95d252d6d3685be9b356d0b7500 100644 (file)
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -979,8 +979,10 @@ If HANDLES is non-nil, use it instead reparsing the buffer."
   (unless handles
     (setq handles (mm-dissect-buffer t)))
   (goto-char (point-min))
-  (search-forward "\n\n" nil t)
-  (delete-region (point) (point-max))
+  (if (search-forward "\n\n" nil 'move)
+      (delete-region (point) (point-max))
+    ;; No content in the part that is the sole part of this message.
+    (insert (if (bolp) "\n" "\n\n")))
   (if (stringp (car handles))
       (mml-insert-mime handles)
     (mml-insert-mime handles t))