Merge from emacs-23; up to 2010-06-02T00:10:42Z!yamaoka@jpl.org.

3 files changed, 44 insertions, 21 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 14ef035445a..df3098332f9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2011-02-23  Kenichi Handa  <handa@m17n.org>
+
+        * mail/rmailmm.el (rmail-mime-process-multipart): Do not signal an
+        error when a multipart boundary in the nested multipart is found.
+
+        * mail/rmail.el (rmail-start-mail): Decode "encoded-words" of
+        header components.
+
 2011-02-23  Glenn Morris  <rgm@gnu.org>
 
         * dired.el (dired-mode): Call hack-dir-local-variables-non-file-buffer.
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 06867f6d92a..7fe5383d865 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -3443,6 +3443,16 @@ does not pop any summary buffer."
         (setq yank-action (list 'insert-buffer replybuffer)))
     (push (cons "cc" cc) other-headers)
     (push (cons "in-reply-to" in-reply-to) other-headers)
+    (setq other-headers
+          (mapcar #'(lambda (elt)
+                      (cons (car elt) (if (stringp (cdr elt))
+                                          (rfc2047-decode-string (cdr elt)))))
+                  other-headers))
+    (if (stringp to) (setq to (rfc2047-decode-string to)))
+    (if (stringp in-reply-to)
+        (setq in-reply-to (rfc2047-decode-string in-reply-to)))
+    (if (stringp cc) (setq cc (rfc2047-decode-string cc)))
+    (if (stringp subject) (setq subject (rfc2047-decode-string subject)))
     (prog1
         (compose-mail to subject other-headers noerase
                       switch-function yank-action sendactions
@@ -3450,7 +3460,7 @@ does not pop any summary buffer."
       (if (eq switch-function 'switch-to-buffer-other-frame)
           ;; This is not a standard frame parameter; nothing except
           ;; sendmail.el looks at it.
-          (modify-frame-parameters (selected-frame)
+            (modify-frame-parameters (selected-frame)
                                    '((mail-dedicated-frame . t)))))))
 
 (defun rmail-mail-return ()
diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index 0bfeb121ca4..96132739b20 100644
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -853,28 +853,33 @@ The other arguments are the same as `rmail-mime-multipart-handler'."
             ((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))