From 63b48cebe0aa16dc701d11a162109b9bba5c2765 Mon Sep 17 00:00:00 2001
From: Gnus develoeprs <ding@gnus.org>
Date: Tue, 3 May 2011 22:41:28 +0000
Subject: [PATCH] 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.
---
 doc/misc/ChangeLog    | 6 ++++++
 doc/misc/gnus.texi    | 6 ++++--
 lisp/gnus/ChangeLog   | 7 +++++++
 lisp/gnus/registry.el | 2 +-
 lisp/gnus/shr.el      | 7 +++++++
 5 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 057ee77fc6f..15f62235ec2 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-03  Peter Münster  <pmlists@free.fr>
+
+	* gnus.texi (Summary Buffer Lines):
+	gnus-summary-user-date-format-alist does not exist.
+	(Sorting the Summary Buffer): More about sorting threads.
+
 2011-04-25  Michael Albinus  <michael.albinus@gmx.de>
 
 	* trampver.texi: Update release number.
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 9d9b767bcba..a35a7e85794 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -4953,7 +4953,7 @@ Download mark.
 Desired cursor position (instead of after first colon).
 @item &user-date;
 Age sensitive date format.  Various date format is defined in
-@code{gnus-summary-user-date-format-alist}.
+@code{gnus-user-date-format-alist}.
 @item u
 User defined specifier.  The next character in the format string should
 be a letter.  Gnus will call the function
@@ -7340,7 +7340,9 @@ predicate functions include @code{gnus-thread-sort-by-number},
 
 Each function takes two threads and returns non-@code{nil} if the first
 thread should be sorted before the other.  Note that sorting really is
-normally done by looking only at the roots of each thread.
+normally done by looking only at the roots of each thread.  Exceptions
+to this rule are @code{gnus-thread-sort-by-most-recent-number} and
+@code{gnus-thread-sort-by-most-recent-date}.
 
 If you use more than one function, the primary sort key should be the
 last function in the list.  You should probably always include
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 0ab9f8b02e2..30f5c743bc0 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)
-- 
2.11.4.GIT