[Emacs-diffs] /srv/bzr/emacs/trunk r105804: mm-decode.el (mm-inline-media-tests): Support imagemagick images.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 105804
author: Lars Magne Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Sat 2011-09-17 12:02:10 +0000
message:
  mm-decode.el (mm-inline-media-tests): Support imagemagick images.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/mm-decode.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-09-15 05:46:40 +0000
+++ b/lisp/gnus/ChangeLog       2011-09-17 12:02:10 +0000
@@ -1,3 +1,7 @@
+2011-09-17  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * mm-decode.el (mm-inline-media-tests): Support imagemagick images.
+
 2011-09-15  Lars Magne Ingebrigtsen  <address@hidden>
 
        * gnus-sum.el (gnus-summary-read-group-1): Bump the "Retrieving"

=== modified file 'lisp/gnus/mm-decode.el'
--- a/lisp/gnus/mm-decode.el    2011-08-04 00:58:07 +0000
+++ b/lisp/gnus/mm-decode.el    2011-09-17 12:02:10 +0000
@@ -195,7 +195,7 @@
     ("image/tiff"
      mm-inline-image
      (lambda (handle)
-       (mm-valid-and-fit-image-p 'tiff handle)) )
+       (mm-valid-and-fit-image-p 'tiff handle)))
     ("image/xbm"
      mm-inline-image
      (lambda (handle)
@@ -265,6 +265,20 @@
     ("multipart/alternative" ignore identity)
     ("multipart/mixed" ignore identity)
     ("multipart/related" ignore identity)
+    ("image/*"
+     mm-inline-image
+     (lambda (handle)
+       (and (mm-valid-image-format-p 'imagemagick)
+           (mm-with-unibyte-buffer
+             (mm-insert-part handle)
+             (let ((image
+                    (ignore-errors
+                      (if (fboundp 'create-image)
+                          (create-image (buffer-string) 'imagemagick 'data-p)
+                        (mm-create-image-xemacs type)))))
+               (when image
+                 (setcar (cdr handle) (list "image/imagemagick"))
+                 (mm-image-fit-p handle)))))))
     ;; Disable audio and image
     ("audio/.*" ignore ignore)
     ("image/.*" ignore ignore)