(gnus-image-type-available-p): Test `display-images-p' before `image-type-available-p'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f298ad6..a84b67c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-06-06  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * gnus-ems.el (gnus-image-type-available-p): Test `display-images-p'
+       before `image-type-available-p' to avoid loading the image libraries
+       needlessly.
+
 2013-06-05  David Engster  <deng@randomsample.de>
 
        * gnus-sum.el (gnus-update-marks): Do not remove empty 'unexist'

diff --git a/lisp/gnus-ems.el b/lisp/gnus-ems.el
index 4d9b579..f9ef70f 100644 (file)
--- a/lisp/gnus-ems.el
+++ b/lisp/gnus-ems.el
@@ -165,10 +165,10 @@
 
 (defun gnus-image-type-available-p (type)
   (and (fboundp 'image-type-available-p)
-       (image-type-available-p type)
        (if (fboundp 'display-images-p)
           (display-images-p)
-        t)))
+        t)
+       (image-type-available-p type)))
 
 (defun gnus-create-image (file &optional type data-p &rest props)
   (let ((face (plist-get props :face)))