Mercurial > emacs
changeset 105175:721db724bb12
(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.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Thu, 24 Sep 2009 03:15:27 +0000 |
| parents | 13f171fbff05 |
| children | debabf496159 |
| files | lisp/ChangeLog lisp/mail/rmailmm.el |
| diffstat | 2 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Sep 24 02:37:37 2009 +0000 +++ b/lisp/ChangeLog Thu Sep 24 03:15:27 2009 +0000 @@ -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
--- a/lisp/mail/rmailmm.el Thu Sep 24 02:37:37 2009 +0000 +++ b/lisp/mail/rmailmm.el Thu Sep 24 03:15:27 2009 +0000 @@ -213,10 +213,10 @@ ;; 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