[Emacs-diffs] /srv/bzr/emacs/trunk r104096: Merge changes made in Gnus trunk.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 104096
author: Gnus develoeprs <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2011-05-03 22:41:28 +0000
message:
  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.
modified:
  doc/misc/ChangeLog
  doc/misc/gnus.texi
  lisp/gnus/ChangeLog
  lisp/gnus/registry.el
  lisp/gnus/shr.el

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2011-04-25 18:14:38 +0000
+++ b/doc/misc/ChangeLog        2011-05-03 22:41:28 +0000
@@ -1,3 +1,9 @@
+2011-05-03  Peter Münster  <address@hidden>
+
+       * 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  <address@hidden>
 
        * trampver.texi: Update release number.

=== modified file 'doc/misc/gnus.texi'
--- a/doc/misc/gnus.texi        2011-04-14 12:43:49 +0000
+++ b/doc/misc/gnus.texi        2011-05-03 22:41:28 +0000
@@ -4953,7 +4953,7 @@
 Desired cursor position (instead of after first colon).
 @item &user-date;
 Age sensitive date format.  Various date format is defined in
address@hidden
address@hidden
 @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 @@
 
 Each function takes two threads and returns address@hidden 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
address@hidden
 
 If you use more than one function, the primary sort key should be the
 last function in the list.  You should probably always include

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-05-02 22:41:38 +0000
+++ b/lisp/gnus/ChangeLog       2011-05-03 22:41:28 +0000
@@ -1,3 +1,10 @@
+2011-05-03  Teodor Zlatanov  <address@hidden>
+
+       * 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  <address@hidden>
 
        * gnus-html.el (gnus-html-schedule-image-fetching): Use

=== modified file 'lisp/gnus/registry.el'
--- a/lisp/gnus/registry.el     2011-04-18 22:59:02 +0000
+++ b/lisp/gnus/registry.el     2011-05-03 22:41:28 +0000
@@ -272,7 +272,7 @@
     (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))

=== modified file 'lisp/gnus/shr.el'
--- a/lisp/gnus/shr.el  2011-05-02 22:41:38 +0000
+++ b/lisp/gnus/shr.el  2011-05-03 22:41:28 +0000
@@ -91,6 +91,12 @@
   "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 @@
    :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)