diff lisp/gnus/gnus-art.el @ 81154:27cf42dce35e

Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 226) - Update from CVS 2007-06-04 Katsumi Yamaoka <yamaoka@jpl.org> * lisp/gnus/gnus-art.el (gnus-mime-view-part-externally) (gnus-mime-view-part-internally): Fix predicate function passed to completing-read. * lisp/gnus/mm-decode.el (mm-image-fit-p): Return t if argument is not an image; return t if image size is just the same as window size. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-786
author Miles Bader <miles@gnu.org>
date Wed, 06 Jun 2007 02:19:13 +0000
parents 6518bb67d7fa
children 71f54ad86dca
line wrap: on
line diff
--- a/lisp/gnus/gnus-art.el	Tue Jun 05 18:29:37 2007 +0000
+++ b/lisp/gnus/gnus-art.el	Wed Jun 06 02:19:13 2007 +0000
@@ -4674,7 +4674,7 @@
          (mm-enable-external t))
     (if (not (stringp method))
 	(gnus-mime-view-part-as-type
-	 nil (lambda (type) (stringp (mailcap-mime-info type))))
+	 nil (lambda (types) (stringp (mailcap-mime-info (car types)))))
       (when handle
 	(if (mm-handle-undisplayer handle)
 	    (mm-remove-part handle)
@@ -4695,7 +4695,7 @@
 	 (inhibit-read-only t))
     (if (not (mm-inlinable-p handle))
         (gnus-mime-view-part-as-type
-         nil (lambda (type) (mm-inlinable-p handle type)))
+         nil (lambda (types) (mm-inlinable-p handle (car types))))
       (when handle
 	(if (mm-handle-undisplayer handle)
 	    (mm-remove-part handle)