From: Jeffrey C Honig Date: Mon, 20 Aug 2007 02:32:54 +0000 (+0000) Subject: (mh-mml-forward-message): Address SF 1378993 and X-Git-Tag: emacs-pretest-23.0.90~11442 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d7c5b212c91bd7e270471e2c307d0c9338cbb102;p=emacs.git (mh-mml-forward-message): Address SF 1378993 and forward messages as inline attatchments. --- diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index 748b1e293e1..8c91b633c6d 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -1,3 +1,8 @@ +2007-08-20 Jeffrey C Honig + + * mh-mime.el (mh-mml-forward-message): Address SF 1378993 and + forward messages as inline attatchments. + 2007-08-19 Jeffrey C Honig * mh-e.el (mh-invisible-header-fields-internal): We want to show diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el index eefaa0ed8ac..ffe558d1a62 100644 --- a/lisp/mh-e/mh-mime.el +++ b/lisp/mh-e/mh-mime.el @@ -1220,16 +1220,11 @@ MESSAGE number." mh-sent-from-msg (string-to-number message)))) (cond ((integerp msg) - (if (string= "" description) - ;; Rationale: mml-attach-file constructs a malformed composition - ;; if the description string is empty. This fixes SF #625168. - (mml-attach-file (format "%s%s/%d" - mh-user-path (substring folder 1) msg) - "message/rfc822") - (mml-attach-file (format "%s%s/%d" - mh-user-path (substring folder 1) msg) - "message/rfc822" - description))) + (mml-attach-file (format "%s%s/%d" + mh-user-path (substring folder 1) msg) + "message/rfc822" + (if (string= "" description) nil description) + "inline")) (t (error "The message number, %s, is not a integer" msg))))) (defun mh-mh-forward-message (&optional description folder messages)