diff options
| author | Miles Bader <miles@gnu.org> | 2005-08-02 07:21:08 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2005-08-02 07:21:08 +0000 |
| commit | afea040a3d16a892ca86589c33ea4b0e30f7a320 (patch) | |
| tree | 1c1a45c96023946304c132206f11cf48d0b9f4a3 /lisp/gnus/mml.el | |
| parent | a4fbb790db4e05bab11b0837872cc45d536aee7a (diff) | |
| download | emacs-afea040a3d16a892ca86589c33ea4b0e30f7a320.tar.gz emacs-afea040a3d16a892ca86589c33ea4b0e30f7a320.tar.bz2 emacs-afea040a3d16a892ca86589c33ea4b0e30f7a320.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-507
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 100)
- Update from CVS
2005-08-02 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/mml.el (mml-generate-mime-1): Make the content type default to
text/plain if the filename is not specified.
2005-08-01 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-uu.el (gnus-uu-save-article): Use insert-buffer-substring
instead of insert-buffer.
* lisp/gnus/message.el (message-yank-original): Ditto; set the mark at the
end of the yanked message.
Diffstat (limited to 'lisp/gnus/mml.el')
| -rw-r--r-- | lisp/gnus/mml.el | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el index 57e2b54e733..4a3a568d34c 100644 --- a/lisp/gnus/mml.el +++ b/lisp/gnus/mml.el @@ -409,8 +409,10 @@ If MML is non-nil, return the buffer up till the correspondent mml tag." (let* ((raw (cdr (assq 'raw cont))) (filename (cdr (assq 'filename cont))) (type (or (cdr (assq 'type cont)) - (and filename (mm-default-file-encoding filename)) - "application/octet-stream")) + (if filename + (or (mm-default-file-encoding filename) + "application/octet-stream") + "text/plain"))) coded encoding charset flowed) (if (and (not raw) (member (car (split-string type "/")) '("text" "message"))) @@ -533,8 +535,10 @@ If MML is non-nil, return the buffer up till the correspondent mml tag." (insert "\n\n") (insert "Content-Type: " (or (cdr (assq 'type cont)) - (and name (mm-default-file-encoding name)) - "application/octet-stream") + (if name + (or (mm-default-file-encoding name) + "application/octet-stream") + "text/plain")) "\n") (insert "Content-ID: " (message-make-message-id) "\n") (insert "Content-Transfer-Encoding: " |