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

* gnus.el (gnus-update-message-archive-method): Add :version.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5afdf45..7f8e981 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+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.
+
+       * gnus.el (gnus-update-message-archive-method): Add :version.
+
 2007-06-01  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus.el (gnus-update-message-archive-method): New variable.

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 1ae9107..85124ad 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -4915,7 +4915,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)
@@ -4936,7 +4936,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.el b/lisp/gnus.el
index 0a922c9..c5038b7 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -1309,6 +1309,7 @@ updated if the value of this variable is nil, even if you change the
 value of `gnus-message-archive-method' afterward.  If you want the
 saved \"archive\" method to be updated whenever you change the value of
 `gnus-message-archive-method', set this variable to a non-nil value."
+  :version "23.0" ;; No Gnus
   :group 'gnus-server
   :group 'gnus-message
   :type 'boolean)

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index f339fbd..823d98a 100644 (file)
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -1380,18 +1380,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."