Merge from trunk.

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

diff --git a/lisp/gnus/smiley.el b/lisp/gnus/smiley.el
index 2f5c74220eae6d0bafb20aad4d2682841bfdae17..cf23deb174bbfa6090030f6a90b9a1f4d35814f6 100644 (file)
--- a/lisp/gnus/smiley.el
+++ b/lisp/gnus/smiley.el
@@ -133,9 +133,11 @@ regexp to replace with IMAGE.  IMAGE is the name of an image file in
   (let ((types (list "pbm")))
     (when (gnus-image-type-available-p 'xpm)
       (push "xpm" types))
+    (when (gnus-image-type-available-p 'gif)
+      (push "gif" types))
     types)
   "*List of suffixes on smiley file names to try."
-  :version "22.1"
+  :version "24.1"
   :type '(repeat string)
   :group 'smiley)