(mm-archive-dissect-and-inline): Fix up the undisplayer.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 905e6f5..2e3721c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,7 @@
 2012-02-09  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * mm-archive.el (mm-archive-dissect-and-inline): New function.
+       (mm-archive-dissect-and-inline): Fix up the undisplayer.
 
        * gnus-compat.el: Define `timer-set-function'.
 

diff --git a/lisp/mm-archive.el b/lisp/mm-archive.el
index 3f01735..5ca6616 100644 (file)
--- a/lisp/mm-archive.el
+++ b/lisp/mm-archive.el
@@ -80,8 +80,20 @@
     handles))
 
 (defun mm-archive-dissect-and-inline (handle)
-  (dolist (handle (cddr (mm-dissect-archive handle)))
-    (mm-display-inline handle)))
+  (let ((start (point-marker)))
+    (save-restriction
+      (narrow-to-region (point) (point))
+      (dolist (handle (cddr (mm-dissect-archive handle)))
+       (goto-char (point-max))
+       (mm-display-inline handle))
+      (goto-char (point-max))
+      (mm-handle-set-undisplayer
+       handle
+       `(lambda ()
+         (let ((inhibit-read-only t)
+               (end ,(point-marker)))
+           (remove-images ,start end)
+           (delete-region ,start end)))))))
 
 (provide 'mm-archive)