Commit 9b8801ec authored by Miles Bader's avatar Miles Bader
Browse files

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 246-247)

   - Update from CVS

2007-08-23  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/mml.el (mml-generate-mime): Make sure it uses multibyte temp buffer.
   (mml-generate-mime-1): Don't encode body if it is specified to be in
   raw form; don't make buffer be unibyte when inserting multibyte string.

2007-08-24  IRIE Tetsuya  <irie@t.email.ne.jp>  (tiny change)

   * man/message.texi (MIME): Replace mml-attach with mml-attach-file.

Revision: emacs@sv.gnu.org/emacs--rel--22--patch-100
parent 619fb9ee
2007-08-23 Katsumi Yamaoka <yamaoka@jpl.org>
* mml.el (mml-generate-mime): Make sure it uses multibyte temp buffer.
(mml-generate-mime-1): Don't encode body if it is specified to be in
raw form; don't make buffer be unibyte when inserting multibyte string.
2007-08-23 Stefan Monnier <monnier@iro.umontreal.ca>
* sha1.el: Fix up comment style.
......
......@@ -404,7 +404,7 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
(mml-multipart-number mml-multipart-number))
(if (not cont)
nil
(with-temp-buffer
(mm-with-multibyte-buffer
(if (and (consp (car cont))
(= (length cont) 1))
(mml-generate-mime-1 (car cont))
......@@ -516,14 +516,13 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
(progn
(mm-enable-multibyte)
(insert contents)
(setq charset (mm-encode-body)))
(unless raw
(setq charset (mm-encode-body))))
(insert contents)))))
(setq encoding (mm-encode-buffer type)
coded (mm-string-as-multibyte (buffer-string))))
(mml-insert-mime-headers cont type charset encoding nil)
(insert "\n")
(mm-with-unibyte-current-buffer
(insert coded)))))
(insert "\n" coded))))
((eq (car cont) 'external)
(insert "Content-Type: message/external-body")
(let ((parameters (mml-parameter-string
......
2007-08-24 IRIE Tetsuya <irie@t.email.ne.jp> (tiny change)
* message.texi (MIME): Replace mml-attach with mml-attach-file.
2007-08-27 Richard Stallman <rms@gnu.org>
* emacs.texi (Top): Clarify menu item for Glossary.
......
......@@ -821,11 +821,11 @@ doesn't have to do anything to make the @acronym{MIME} happen---Message will
automatically add the @code{Content-Type} and
@code{Content-Transfer-Encoding} headers.
@findex mml-attach
@findex mml-attach-file
@kindex C-c C-a
The most typical thing users want to use the multipart things in
@acronym{MIME} for is to add ``attachments'' to mail they send out.
This can be done with the @kbd{C-c C-a} command (@kbd{M-x mml-attach}),
This can be done with the @kbd{C-c C-a} command (@kbd{M-x mml-attach-file}),
which will prompt for a file name and a @acronym{MIME} type.
@vindex mml-dnd-protocol-alist
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment