From f47239a9c912e7736118ea5420fdaad718f82658 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Wed, 7 Sep 2005 22:08:15 +0000 Subject: [PATCH] Synch to No Gnus 200509071545. --- lisp/ChangeLog | 3 +++ lisp/gnus-sum.el | 20 +++++++++++++------- texi/ChangeLog | 5 +++++ texi/gnus-ja.texi | 4 ++-- texi/gnus.texi | 7 ++++--- 5 files changed, 27 insertions(+), 12 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b2538ae..ca1ec14 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2005-09-07 Reiner Steib + * gnus-sum.el (gnus-thread-sort-by-recipient): New function to + make `gnus-summary-sort-by-recipient' work with threading. + * nnweb.el (nnweb-google-wash-article): Print a message if article is not available. diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index 0c45576..7a7c0ae 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -804,20 +804,21 @@ Each list item can also be a list `(not F)' where F is a function; this specifies reversed sort order. Ready-made functions include `gnus-thread-sort-by-number', -`gnus-thread-sort-by-author', `gnus-thread-sort-by-subject', -`gnus-thread-sort-by-date', `gnus-thread-sort-by-score', -`gnus-thread-sort-by-most-recent-number', -`gnus-thread-sort-by-most-recent-date', -`gnus-thread-sort-by-random', and -`gnus-thread-sort-by-total-score' (see `gnus-thread-score-function'). +`gnus-thread-sort-by-author', `gnus-thread-sort-by-recipient' +`gnus-thread-sort-by-subject', `gnus-thread-sort-by-date', +`gnus-thread-sort-by-score', `gnus-thread-sort-by-most-recent-number', +`gnus-thread-sort-by-most-recent-date', `gnus-thread-sort-by-random', +and `gnus-thread-sort-by-total-score' (see +`gnus-thread-score-function'). When threading is turned off, the variable `gnus-article-sort-functions' controls how articles are sorted." :group 'gnus-summary-sort - :type '(repeat + :type '(repeat (gnus-widget-reversible (choice (function-item gnus-thread-sort-by-number) (function-item gnus-thread-sort-by-author) + (function-item gnus-thread-sort-by-recipient) (function-item gnus-thread-sort-by-subject) (function-item gnus-thread-sort-by-date) (function-item gnus-thread-sort-by-score) @@ -4602,6 +4603,11 @@ using some other form will lead to serious barfage." (or (cdr (assq 'To (mail-header-extra h2))) "")))) (or (car extract) (cadr extract))))) +(defun gnus-thread-sort-by-recipient (h1 h2) + "Sort threads by root recipient." + (gnus-article-sort-by-recipient + (gnus-thread-header h1) (gnus-thread-header h2))) + (defsubst gnus-article-sort-by-subject (h1 h2) "Sort articles by root subject." (string-lessp diff --git a/texi/ChangeLog b/texi/ChangeLog index 6db605c..10153a6 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,8 @@ +2005-09-07 Reiner Steib + + * gnus.texi (Sorting the Summary Buffer): Added + gnus-thread-sort-by-recipient. + 2005-09-05 Katsumi Yamaoka * gnus-news.texi: Fix reference. diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index b67a4c9..5e3f638 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -6818,7 +6818,7 @@ gnus $B$O(B @code{Subject} $BMs$rD4$Y$k$3$H$K$h$C$F%9%l%C%I$r=8$a$^$9!#$3$l$O @findex gnus-thread-sort-by-score @findex gnus-thread-sort-by-subject @findex gnus-thread-sort-by-author -@c @findex gnus-thread-sort-by-recipient +@findex gnus-thread-sort-by-recipient @findex gnus-thread-sort-by-number @findex gnus-thread-sort-by-random @vindex gnus-thread-sort-functions @@ -6831,7 +6831,7 @@ gnus $B$O(B @code{Subject} $BMs$rD4$Y$k$3$H$K$h$C$F%9%l%C%I$r=8$a$^$9!#$3$l$O $B%G%#%U%)%k%H$G$OJB$YBX$($O5-;vHV9f$K4p$E$$$F9T$J$o$l$^$9!#$9$G$KMQ0U$5$l(B $B$F$$$kJB$YBX$(=R8l4X?t$O(B @code{gnus-thread-sort-by-number}, -@code{gnus-thread-sort-by-author}, +@code{gnus-thread-sort-by-author}, @code{gnus-thread-sort-by-recipient}, @code{gnus-thread-sort-by-subject}, @code{gnus-thread-sort-by-date}, @code{gnus-thread-sort-by-score}, @code{gnus-thread-sort-by-most-recent-number}, diff --git a/texi/gnus.texi b/texi/gnus.texi index fdfc76c..979d094 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -7008,7 +7008,7 @@ Matching}). @findex gnus-thread-sort-by-score @findex gnus-thread-sort-by-subject @findex gnus-thread-sort-by-author -@c @findex gnus-thread-sort-by-recipient +@findex gnus-thread-sort-by-recipient @findex gnus-thread-sort-by-number @findex gnus-thread-sort-by-random @vindex gnus-thread-sort-functions @@ -7021,8 +7021,9 @@ function, a list of functions, or a list containing functions and By default, sorting is done on article numbers. Ready-made sorting predicate functions include @code{gnus-thread-sort-by-number}, -@code{gnus-thread-sort-by-author}, @code{gnus-thread-sort-by-subject}, -@code{gnus-thread-sort-by-date}, @code{gnus-thread-sort-by-score}, +@code{gnus-thread-sort-by-author}, @code{gnus-thread-sort-by-recipient}, +@code{gnus-thread-sort-by-subject}, @code{gnus-thread-sort-by-date}, +@code{gnus-thread-sort-by-score}, @code{gnus-thread-sort-by-most-recent-number}, @code{gnus-thread-sort-by-most-recent-date}, @code{gnus-thread-sort-by-random} and -- 1.7.10.4