From: Miles Bader <miles@gnu.org>
Date: Wed, 6 Jun 2007 02:19:13 +0000 (+0000)
Subject: Merge from gnus--rel--5.10
X-Git-Tag: emacs-pretest-23.0.90~12487
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=29ec0239fd440dcc19b216fc63efdf3b050793d4;p=emacs.git

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
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 631869e4f34..93c860812c5 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,12 @@
+2007-06-04  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-art.el (gnus-mime-view-part-externally)
+	(gnus-mime-view-part-internally): Fix predicate function passed to
+	completing-read.
+
+	* 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.
+
 2007-05-28  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* message.el (message-pop-to-buffer): Add switch-function argument.
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 013bf48110d..24273abb376 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -4674,7 +4674,7 @@ specified charset."
          (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 @@ If no internal viewer is available, use an external viewer."
 	 (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)
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 6d52d8b2f16..028855ab341 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -1371,18 +1371,19 @@ be determined."
 (defun mm-image-fit-p (handle)
   "Say whether the image in HANDLE will fit the current window."
   (let ((image (mm-get-image handle)))
-    (if (fboundp 'glyph-width)
-	;; XEmacs' glyphs can actually tell us about their width, so
-	;; lets be nice and smart about them.
-	(or mm-inline-large-images
-	    (and (< (glyph-width image) (window-pixel-width))
-		 (< (glyph-height image) (window-pixel-height))))
-      (let* ((size (image-size image))
-	     (w (car size))
-	     (h (cdr size)))
-	(or mm-inline-large-images
-	    (and (< h (1- (window-height))) ; Don't include mode line.
-		 (< w (window-width))))))))
+    (or (not image)
+	(if (fboundp 'glyph-width)
+	    ;; XEmacs' glyphs can actually tell us about their width, so
+	    ;; lets be nice and smart about them.
+	    (or mm-inline-large-images
+		(and (<= (glyph-width image) (window-pixel-width))
+		     (<= (glyph-height image) (window-pixel-height))))
+	  (let* ((size (image-size image))
+		 (w (car size))
+		 (h (cdr size)))
+	    (or mm-inline-large-images
+		(and (<= h (1- (window-height))) ; Don't include mode line.
+		     (<= w (window-width)))))))))
 
 (defun mm-valid-image-format-p (format)
   "Say whether FORMAT can be displayed natively by Emacs."