summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorJeffrey C Honig <jch@bsdi.com>2007-08-20 02:32:54 +0000
committerJeffrey C Honig <jch@bsdi.com>2007-08-20 02:32:54 +0000
commitd7c5b212c91bd7e270471e2c307d0c9338cbb102 (patch)
tree215460b5ba7a024345a3bd0c1966cd9164c7cd6c /lisp
parentb6fd8984bd123fbdb128815d08b52c89b796973c (diff)
downloademacs-d7c5b212c91bd7e270471e2c307d0c9338cbb102.tar.gz
emacs-d7c5b212c91bd7e270471e2c307d0c9338cbb102.tar.bz2
emacs-d7c5b212c91bd7e270471e2c307d0c9338cbb102.zip
(mh-mml-forward-message): Address SF 1378993 and
forward messages as inline attatchments.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/mh-e/ChangeLog5
-rw-r--r--lisp/mh-e/mh-mime.el15
2 files changed, 10 insertions, 10 deletions
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 <jch@honig.net>
+
+ * mh-mime.el (mh-mml-forward-message): Address SF 1378993 and
+ forward messages as inline attatchments.
+
2007-08-19 Jeffrey C Honig <jch@honig.net>
* 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)