Merge changes made in Gnus trunk.

gnus.texi (Summary Buffer Lines): gnus-summary-user-date-format-alist does not exist.
 (Sorting the Summary Buffer): More about sorting threads.
shr.el: Add shr-link face for links.
 (shr-urlify): Use it.
registry.el (registry-insert): Make error message more helpful.

3 files changed, 15 insertions, 1 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 784f374bafa..a6d857ed660 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-03  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * shr.el: Add shr-link face for links.
+        (shr-urlify): Use it.
+
+        * registry.el (registry-insert): Make error message more helpful.
+
 2011-05-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * gnus-html.el (gnus-html-schedule-image-fetching): Use
diff --git a/lisp/gnus/registry.el b/lisp/gnus/registry.el
index 1a18dbd50d2..e82ca8d9b6f 100644
--- a/lisp/gnus/registry.el
+++ b/lisp/gnus/registry.el
@@ -272,7 +272,7 @@ Errors out if the key exists already."
     (assert (< (registry-size db)
                (oref db :max-hard))
             nil
-            "max-hard size limit reached")
+            "registry max-hard size limit reached")
 
     ;; store the entry
     (puthash key entry (oref db :data))
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index b2e4f1dc61d..d865b2d6087 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -91,6 +91,12 @@ cid: URL as the argument.")
   "Font for <s> elements."
   :group 'shr)
 
+(defface shr-link '((t (:underline t)
+                       (:foreground "yellow")
+                       (:background "black")))
+  "Font for <s> elements."
+  :group 'shr)
+
 ;;; Internal variables.
 
 (defvar shr-folding-mode nil)
@@ -591,6 +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) 'shr-url url))
 
 (defun shr-encode-url (url)