procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from gnus--devo--0

Browse source 
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1561
This commit is contained in:
Miles Bader 2009-03-03 02:32:23 +00:00
parent 86c507f71d
commit 9cdff61311
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/gnus/ChangeLog
View file

@ -1,3 +1,7 @@
2009-03-02 Katsumi Yamaoka <yamaoka@jpl.org>
* mml.el (mml-insert-mime): Don't break parts that mm-uu dissected.
2009-02-25 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-dired.el: Remove autoload for gnus-setup-message.

15
lisp/gnus/mml.el
View file

@ -898,10 +898,17 @@ If HANDLES is non-nil, use it instead reparsing the buffer."
(unless (setq textp (equal (mm-handle-media-supertype handle) "text"))
(save-excursion
(set-buffer (setq buffer (mml-generate-new-buffer " *mml*")))
(mm-insert-part handle 'no-cache)
(if (setq mmlp (equal (mm-handle-media-type handle)
"message/rfc822"))
(mime-to-mml)))))
(if (eq (mail-content-type-get (mm-handle-type handle) 'charset)
'gnus-decoded)
;; A part that mm-uu dissected from a non-MIME message
;; because of `gnus-article-emulate-mime'.
(progn
(mm-enable-multibyte)
(insert-buffer-substring (mm-handle-buffer handle)))
(mm-insert-part handle 'no-cache)
(if (setq mmlp (equal (mm-handle-media-type handle)
"message/rfc822"))
(mime-to-mml))))))
(if mmlp
(mml-insert-mml-markup handle nil t t)
(unless (and no-markup