Mercurial > emacs
changeset 78673:a296c3e20ccc
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
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Mon, 27 Aug 2007 04:01:49 +0000 |
| parents | 24374b4e3454 |
| children | f42abb3aa754 |
| files | lisp/gnus/ChangeLog lisp/gnus/mml.el man/ChangeLog man/message.texi |
| diffstat | 4 files changed, 16 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Mon Aug 27 03:57:15 2007 +0000 +++ b/lisp/gnus/ChangeLog Mon Aug 27 04:01:49 2007 +0000 @@ -1,3 +1,9 @@ +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.
--- a/lisp/gnus/mml.el Mon Aug 27 03:57:15 2007 +0000 +++ b/lisp/gnus/mml.el Mon Aug 27 04:01:49 2007 +0000 @@ -404,7 +404,7 @@ (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 @@ (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
--- a/man/ChangeLog Mon Aug 27 03:57:15 2007 +0000 +++ b/man/ChangeLog Mon Aug 27 04:01:49 2007 +0000 @@ -1,3 +1,7 @@ +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.
--- a/man/message.texi Mon Aug 27 03:57:15 2007 +0000 +++ b/man/message.texi Mon Aug 27 04:01:49 2007 +0000 @@ -821,11 +821,11 @@ 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