[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100497: mail/rmailmm.el (rmail-mime-process-multipart): Do not signal an error when a multipart boundary in the nested multipart is found.

[Kenichi Handa]

------------------------------------------------------------
revno: 100497 [merge]
committer: Kenichi Handa <address@hidden>
branch nick: emacs-23
timestamp: Wed 2011-02-23 11:33:19 +0900
message:
  mail/rmailmm.el (rmail-mime-process-multipart): Do not signal an error when a 
multipart boundary in the nested multipart is found.
modified:
  lisp/ChangeLog
  lisp/mail/rmailmm.el
  src/ChangeLog

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-02-22 01:49:06 +0000
+++ b/lisp/ChangeLog    2011-02-23 02:32:35 +0000
@@ -1,3 +1,8 @@
+2011-02-23  Kenichi Handa  <address@hidden>
+
+       * mail/rmailmm.el (rmail-mime-process-multipart): Do not signal an
+       error when a multipart boundary in the nested multipart is found.
+
 2011-02-22  Kenichi Handa  <address@hidden>
 
        * mail/rmail.el (rmail-start-mail): Decode "encoded-words" of

=== modified file 'lisp/mail/rmailmm.el'
--- a/lisp/mail/rmailmm.el      2011-02-19 09:22:24 +0000
+++ b/lisp/mail/rmailmm.el      2011-02-23 02:32:35 +0000
@@ -852,28 +852,33 @@
            ((looking-at "[ \t]*\n")
             (setq next (copy-marker (match-end 0) t)))
            (t
-            (rmail-mm-get-boundary-error-message
-             "Malformed boundary" content-type content-disposition
-             content-transfer-encoding)))
-
-      (setq index (1+ index))
-      ;; Handle the part.
-      (if parse-tag
+            ;; The original code signalled an error as below, but
+            ;; this line may be a boundary of nested multipart.  So,
+            ;; we just set `next' to nil to skip this line
+            ;; (rmail-mm-get-boundary-error-message
+            ;;  "Malformed boundary" content-type content-disposition
+            ;;  content-transfer-encoding)
+            (setq next nil)))
+
+      (when next
+       (setq index (1+ index))
+       ;; Handle the part.
+       (if parse-tag
+           (save-restriction
+             (narrow-to-region beg end)
+             (let ((child (rmail-mime-process
+                           nil (format "%s/%d" parse-tag index)
+                           content-type content-disposition)))
+               ;; Display a tagline.
+               (aset (aref (rmail-mime-entity-display child) 1) 1
+                     (aset (rmail-mime-entity-tagline child) 2 t))
+               (push child entities)))
+
+         (delete-region end next)
          (save-restriction
            (narrow-to-region beg end)
-           (let ((child (rmail-mime-process
-                         nil (format "%s/%d" parse-tag index)
-                         content-type content-disposition)))
-             ;; Display a tagline.
-             (aset (aref (rmail-mime-entity-display child) 1) 1
-                   (aset (rmail-mime-entity-tagline child) 2 t))
-             (push child entities)))
-
-       (delete-region end next)
-       (save-restriction
-         (narrow-to-region beg end)
-         (rmail-mime-show)))
-      (goto-char (setq beg next)))
+           (rmail-mime-show)))
+       (goto-char (setq beg next))))
 
     (when parse-tag
       (setq entities (nreverse entities))

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-02-22 01:58:03 +0000
+++ b/src/ChangeLog     2011-02-23 01:56:49 +0000
@@ -8,6 +8,12 @@
 
        * Makefile.in (prefix-args${EXEEXT}): Compile with ALL_CFLAGS.
 
+2011-02-17  Kenichi Handa  <address@hidden>
+
+       * font.c (font_open_entity): Be sure to set scaled_pixel_size.
+       (font_find_for_lface): Check if attrs[LFACE_HEIGHT_INDEX] is
+       integer.
+
 2011-02-13  Eli Zaretskii  <address@hidden>
 
        * xdisp.c (redisplay_internal): Resynchronize `w' if the selected