[Emacs-diffs] emacs/lisp ChangeLog mail/rmailmm.el

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/09/24 03:15:30

Modified files:
        lisp           : ChangeLog 
        lisp/mail      : rmailmm.el 

Log message:
        (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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16247&r2=1.16248
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/rmailmm.el?cvsroot=emacs&r1=1.10&r2=1.11

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16247
retrieving revision 1.16248
diff -u -b -r1.16247 -r1.16248
--- ChangeLog   24 Sep 2009 02:37:37 -0000      1.16247
+++ ChangeLog   24 Sep 2009 03:15:27 -0000      1.16248
@@ -1,3 +1,10 @@
+2009-09-24  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * minibuffer.el (minibuffer-force-complete): Cycle the list, rather

Index: mail/rmailmm.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/rmailmm.el,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- mail/rmailmm.el     15 Sep 2009 02:33:58 -0000      1.10
+++ mail/rmailmm.el     24 Sep 2009 03:15:30 -0000      1.11
@@ -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