[gnus git] branch master updated: m0-7-38-g08c1b3b =1= (gnus-image-type-available-p): Test `display-images-p' before `image-type-available-p'.

       via  08c1b3b14a46b72f4ed5f623a116ea85786b5a2a (commit)
      from  2895658e75b4a0d32c87d43511e4a25b0befdcf1 (commit)


- Log -----------------------------------------------------------------
commit 08c1b3b14a46b72f4ed5f623a116ea85786b5a2a
Author: Ted Zlatanov <[email protected]>
Date:   Thu Jun 6 12:31:14 2013 -0400

    (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
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-06-06  Teodor Zlatanov  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* 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
--- 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)))

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog   |    6 ++++++
 lisp/gnus-ems.el |    4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project