Merge from emacs-24; up to 2013-01-03T02:31:36Z!rgm@gnu.org

[gnu-emacs] / lisp / gnus / gnus-ems.el

diff --git a/lisp/gnus/gnus-ems.el b/lisp/gnus/gnus-ems.el
index ac8bb74f1f58a24d5867bd7475f4ed2c0f6f614a..f9ef70f958018e24aca846814b3737c14ffce7f7 100644 (file)
--- 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)))
@@ -221,8 +221,8 @@
         'window-inside-pixel-edges
       'window-pixel-edges))
 
-  (if (fboundp 'set-process-plist)
-      (progn
+  (if (or (featurep 'emacs) (fboundp 'set-process-plist))
+      (progn                           ; these exist since Emacs 22.1
        (defalias 'gnus-set-process-plist 'set-process-plist)
        (defalias 'gnus-process-plist 'process-plist)
        (defalias 'gnus-process-get 'process-get)