Mercurial > emacs

comparison lisp/gnus/mml.el @ 102366:93b10d2621d3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from gnus--devo--0 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1561
author Miles Bader <miles@gnu.org>
date Tue, 03 Mar 2009 02:32:23 +0000
parents a9dc0e7c3f2b
children b99b3dda298b
comparison
equal deleted inserted replaced
102365:21c800bf2b35 102366:93b10d2621d3
896 ;; Determine type and stuff. 896 ;; Determine type and stuff.
897 (unless (stringp (car handle)) 897 (unless (stringp (car handle))
898 (unless (setq textp (equal (mm-handle-media-supertype handle) "text")) 898 (unless (setq textp (equal (mm-handle-media-supertype handle) "text"))
899 (save-excursion 899 (save-excursion
900 (set-buffer (setq buffer (mml-generate-new-buffer " *mml*"))) 900 (set-buffer (setq buffer (mml-generate-new-buffer " *mml*")))
901 (mm-insert-part handle 'no-cache) 901 (if (eq (mail-content-type-get (mm-handle-type handle) 'charset)
902 (if (setq mmlp (equal (mm-handle-media-type handle) 902 'gnus-decoded)
903 "message/rfc822")) 903 ;; A part that mm-uu dissected from a non-MIME message
904 (mime-to-mml))))) 904 ;; because of `gnus-article-emulate-mime'.
905 (progn
906 (mm-enable-multibyte)
907 (insert-buffer-substring (mm-handle-buffer handle)))
908 (mm-insert-part handle 'no-cache)
909 (if (setq mmlp (equal (mm-handle-media-type handle)
910 "message/rfc822"))
911 (mime-to-mml))))))
905 (if mmlp 912 (if mmlp
906 (mml-insert-mml-markup handle nil t t) 913 (mml-insert-mml-markup handle nil t t)
907 (unless (and no-markup 914 (unless (and no-markup
908 (equal (mm-handle-media-type handle) "text/plain")) 915 (equal (mm-handle-media-type handle) "text/plain"))
909 (mml-insert-mml-markup handle buffer textp))) 916 (mml-insert-mml-markup handle buffer textp)))