diff options
| -rw-r--r-- | lisp/gnus/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/gnus/gnus-ems.el | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 0156894c902..35f9f47936d 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/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-04 Katsumi Yamaoka <yamaoka@jpl.org> * gnus-art.el (article-date-ut, article-update-date-lapsed): Don't diff --git a/lisp/gnus/gnus-ems.el b/lisp/gnus/gnus-ems.el index 4d9b5798247..f9ef70f9580 100644 --- a/lisp/gnus/gnus-ems.el +++ b/lisp/gnus/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))) |