Mercurial > emacs

comparison lisp/gnus/mm-decode.el @ 69949:d0312c3f2374

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-214 Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 83) - Update from CVS
author Miles Bader <miles@gnu.org>
date Wed, 12 Apr 2006 05:23:27 +0000
parents ab0b847baba4
children 322c5c5027dc c156f6a9e7b5
comparison
equal deleted inserted replaced
69948:6b919f4beee5 69949:d0312c3f2374
670 external if displayed external." 670 external if displayed external."
671 (save-excursion 671 (save-excursion
672 (mailcap-parse-mailcaps) 672 (mailcap-parse-mailcaps)
673 (if (mm-handle-displayed-p handle) 673 (if (mm-handle-displayed-p handle)
674 (mm-remove-part handle) 674 (mm-remove-part handle)
675 (let* ((type (mm-handle-media-type handle)) 675 (let* ((ehandle (if (equal (mm-handle-media-type handle)
676 "message/external-body")
677 (progn
678 (unless (mm-handle-cache handle)
679 (mm-extern-cache-contents handle))
680 (mm-handle-cache handle))
681 handle))
682 (type (mm-handle-media-type ehandle))
676 (method (mailcap-mime-info type)) 683 (method (mailcap-mime-info type))
677 (filename (or (mail-content-type-get 684 (filename (or (mail-content-type-get
678 (mm-handle-disposition handle) 'filename) 685 (mm-handle-disposition handle) 'filename)
679 (mail-content-type-get 686 (mail-content-type-get
680 (mm-handle-type handle) 'name) 687 (mm-handle-type handle) 'name)
681 "<file>")) 688 "<file>"))
682 (external mm-enable-external)) 689 (external mm-enable-external))
683 (if (and (mm-inlinable-p handle) 690 (if (and (mm-inlinable-p ehandle)
684 (mm-inlined-p handle)) 691 (mm-inlined-p ehandle))
685 (progn 692 (progn
686 (forward-line 1) 693 (forward-line 1)
687 (mm-display-inline handle) 694 (mm-display-inline handle)
688 'inline) 695 'inline)
689 (when (or method 696 (when (or method
690 (not no-default)) 697 (not no-default))
691 (if (and (not method) 698 (if (and (not method)
692 (equal "text" (car (split-string type)))) 699 (equal "text" (car (split-string type "/"))))
693 (progn 700 (progn
694 (forward-line 1) 701 (forward-line 1)
695 (mm-insert-inline handle (mm-get-part handle)) 702 (mm-insert-inline handle (mm-get-part handle))
696 'inline) 703 'inline)
697 (if (and method ;; If nil, we always use "save". 704 (if (and method ;; If nil, we always use "save".