From: Glenn Morris Date: Thu, 24 Sep 2009 03:15:27 +0000 (+0000) Subject: (rmail-mime-multipart-handler): Accept the case where X-Git-Tag: emacs-pretest-23.1.90~1169 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ffa1fed64f67aceb345e83b53ffa3700008a0826;p=emacs.git (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 d41c8f2d0ac..26342e5697c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2009-09-24 Glenn Morris + + * 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 * minibuffer.el (minibuffer-force-complete): Cycle the list, rather diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el index 5cb0d24f459..0cf22de5214 100644 --- 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