Indent.

[gnus] / lisp / gravatar.el

diff --git a/lisp/gravatar.el b/lisp/gravatar.el
index ec03b1b..50b0ba1 100644 (file)
--- a/lisp/gravatar.el
+++ b/lisp/gravatar.el
@@ -24,7 +24,6 @@
 
 ;;; Code:
 
-(require 'image)
 (require 'url)
 (require 'url-cache)
 
@@ -84,12 +83,22 @@
     (when (search-forward "\n\n" nil t)
       (buffer-substring (point) (point-max)))))
 
+(eval-and-compile
+  (cond ((featurep 'xemacs)
+        (require 'gnus-xmas)
+        (defalias 'gravatar-create-image 'gnus-xmas-create-image))
+       ((featurep 'gnus-ems)
+        (defalias 'gravatar-create-image 'gnus-create-image))
+       (t
+        (require 'image)
+        (defalias 'gravatar-create-image 'create-image))))
+
 (defun gravatar-data->image ()
   "Get data of current buffer and return an image.
 If no image available, return 'error."
   (let ((data (gravatar-get-data)))
     (if data
-        (create-image data  nil t)
+       (gravatar-create-image data  nil t)
       'error)))
 
 ;;;###autoload
@@ -116,7 +125,8 @@ You can provide a list of argument to pass to CB in CBARGS."
   (if (plist-get status :error)
       ;; Error happened.
       (apply cb 'error cbargs)
-    (apply cb (gravatar-data->image) cbargs)))
+    (apply cb (gravatar-data->image) cbargs))
+  (kill-buffer (current-buffer)))
 
 (provide 'gravatar)