(rmail-mime-multipart-handler): Accept the case where

there is no newline after the final mime boundary.  (Bug#4539)
Move markers on insertion so that any buttons inserted don't end up in
the next part of a multipart message.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d41c8f2d0ac565f2e6d267d59281b4f42502c154..26342e5697cc05de87abe116c28700648f808cc4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2009-09-24  Glenn Morris  <rgm@gnu.org>
+
+       * mail/rmailmm.el (rmail-mime-multipart-handler): Accept the case where
+       there is no newline after the final mime boundary.  (Bug#4539)
+       Move markers on insertion so that any buttons inserted don't end up in
+       the next part of a multipart message.
+
 2009-09-24  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * minibuffer.el (minibuffer-force-complete): Cycle the list, rather

diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index 5cb0d24f459d4a9db179e14cc66a411c95812a92..0cf22de5214e1cb8c034fb18e4d17bb0d282229d 100644 (file)
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -213,10 +213,10 @@ format."
       ;; If this is the last boundary according to RFC 2046, hide the
       ;; epilogue, else hide the boundary only.  Use a marker for
       ;; `next' because `rmail-mime-show' may change the buffer.
-      (cond ((looking-at "--[ \t]*\n")
+      (cond ((looking-at "--[ \t]*$")
             (setq next (point-max-marker)))
            ((looking-at "[ \t]*\n")
-            (setq next (copy-marker (match-end 0))))
+            (setq next (copy-marker (match-end 0) t)))
            (t
             (rmail-mm-get-boundary-error-message
              "Malformed boundary" content-type content-disposition