[Emacs-diffs] /srv/bzr/emacs/trunk r112874: gnus-ems.el (gnus-image-type-available-p): Test `display-images-p' before `image-type-available-p'

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 112874
author: Ted Zlatanov <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2013-06-06 22:18:53 +0000
message:
  gnus-ems.el (gnus-image-type-available-p): Test `display-images-p' before 
`image-type-available-p'
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-ems.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2013-06-04 08:14:23 +0000
+++ b/lisp/gnus/ChangeLog       2013-06-06 22:18:53 +0000
@@ -1,3 +1,9 @@
+2013-06-06  Teodor Zlatanov  <address@hidden>
+
+       * 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-04  Katsumi Yamaoka  <address@hidden>
 
        * gnus-art.el (article-date-ut, article-update-date-lapsed): Don't

=== modified file 'lisp/gnus/gnus-ems.el'
--- a/lisp/gnus/gnus-ems.el     2013-05-29 02:40:43 +0000
+++ b/lisp/gnus/gnus-ems.el     2013-06-06 22:18:53 +0000
@@ -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)))