shr.el (shr-urlify): Use shr-add-font to make underlines be less ugly at the end of lines.

smiley.el (gnus-smiley-file-types): Add gif as supported file type.

3 files changed, 13 insertions, 2 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 6ed5a3fdcf4..4aba3a27900 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,12 @@
+2011-05-29  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * shr.el (shr-urlify): Use shr-add-font to make underlines be less ugly
+        at the end of lines.
+
+2011-05-29  Julien Danjou  <julien@danjou.info>
+
+        * smiley.el (gnus-smiley-file-types): Add gif as supported file type.
+
 2011-05-27  Glenn Morris  <rgm@gnu.org>
 
         * gnus-group.el (gnus-bug-group-download-format-alist):
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index d23d9c7724b..ebd854930df 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -601,7 +601,7 @@ START, and END.  Note that START and END should be merkers."
    :help-echo (if title (format "%s (%s)" url title) url)
    :keymap shr-map
    url)
-  (put-text-property start (point) 'face 'shr-link)
+  (shr-add-font start (point) 'shr-link)
   (put-text-property start (point) 'shr-url url))
 
 (defun shr-encode-url (url)
diff --git a/lisp/gnus/smiley.el b/lisp/gnus/smiley.el
index 2f5c74220ea..cf23deb174b 100644
--- 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)