2 files changed, 7 insertions, 2 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 2e8df577f61..a0dab93bca0 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-05  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * shr.el (shr-urlify, shr-link): Still broken but at least doesn't
+        error out because the face is not a list.
+
 2011-05-05  Glenn Morris  <rgm@gnu.org>
 
         * gnus-start.el (gnus-propagate-marks): Declare.
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index d865b2d6087..d8f33c830c7 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -94,7 +94,7 @@ cid: URL as the argument.")
 (defface shr-link '((t (:underline t)
                        (:foreground "yellow")
                        (:background "black")))
-  "Font for <s> elements."
+  "Font for link elements."
   :group 'shr)
 
 ;;; Internal variables.
@@ -597,7 +597,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)
+  (put-text-property start (point) 'face '(shr-link))
   (put-text-property start (point) 'shr-url url))
 
 (defun shr-encode-url (url)