[Emacs-diffs] /srv/bzr/emacs/trunk r101698: gravatar.el (gravatar-create-image): New function.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101698
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Fri 2010-10-01 05:50:11 +0000
message:
  gravatar.el (gravatar-create-image): New function.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gravatar.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-10-01 00:25:50 +0000
+++ b/lisp/gnus/ChangeLog       2010-10-01 05:50:11 +0000
@@ -1,3 +1,10 @@
+2010-10-01  Katsumi Yamaoka  <address@hidden>
+
+       * gravatar.el: Don't load image.el that XEmacs doesn't provide.
+       (gravatar-create-image): New function that's an alias to
+       gnus-xmas-create-image, gnus-create-image, or create-image.
+       (gravatar-data->image): Use it.
+
 2010-09-30  Teodor Zlatanov  <address@hidden>
 
        * gnus-registry.el (gnus-registry-install-nnregistry): New function to

=== modified file 'lisp/gnus/gravatar.el'
--- a/lisp/gnus/gravatar.el     2010-09-24 22:33:34 +0000
+++ b/lisp/gnus/gravatar.el     2010-10-01 05:50:11 +0000
@@ -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