From 8df0f276d549b76fd2e20879dceed0417f8377dd Mon Sep 17 00:00:00 2001 From: yamaoka Date: Mon, 18 Jul 2005 11:30:02 +0000 Subject: [PATCH] Synch to No Gnus 200507181055. --- ChangeLog | 4 ++++ GNUS-NEWS | 7 ++++++- lisp/ChangeLog | 6 ++++++ lisp/gnus-sum.el | 18 ++++++++++++++++-- texi/ChangeLog | 7 +++++++ texi/gnus-ja.texi | 9 ++++++++- texi/gnus-news.texi | 7 ++++++- texi/gnus.texi | 7 +++++++ 8 files changed, 60 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 77e171a..6645edc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-07-18 Romain Francoise + + * GNUS-NEWS: Generated. + 2005-65-16 Katsumi Yamaoka * lisp/gnus-art.el (gnus-article-x-face-command): Remove diff --git a/GNUS-NEWS b/GNUS-NEWS index 01da5fd..97e9021 100644 --- a/GNUS-NEWS +++ b/GNUS-NEWS @@ -91,7 +91,7 @@ message-generate-hashcash t)' to enable. (`gnus-summary-limit-to-recipient'). *Note Limiting::. ** Gnus supports a new sort command in the Summary buffer: `C-c C-s C-t' -(`gnus-summary-sort-by-recipient'). *Note Summary Sorting:: +(`gnus-summary-sort-by-recipient'). *Note Summary Sorting::. ** The `nnrss' back end now supports multilingual text. Non-ASCII group names for the `nnrss' groups are also supported. *Note RSS::. @@ -109,6 +109,11 @@ allows to decay only adaptive score files. *Note Score Decays::. ** S/MIME now feature LDAP user certificate searches. You need to configure the server in `smime-ldap-host-list'. +** Strings prefixed to the `To' and `Newsgroup' headers in summary lines +when using `gnus-ignored-from-addresses' can be customized with +`gnus-summary-to-prefix' and `gnus-summary-newsgroup-prefix'. *Note +To From Newsgroups::. + * For older news, see Gnus info node "New Features". diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3c6ad2c..2c85e92 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2005-07-18 Romain Francoise + + * gnus-sum.el (gnus-summary-to-prefix, + gnus-summary-newsgroup-prefix): New variables. + (gnus-summary-from-or-to-or-newsgroups): Use them. + 2005-07-17 Romain Francoise * mml2015.el (mml2015-clean-buffer): Prefix buffer name with a diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index e5ad988..f6bf937 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -1086,6 +1086,20 @@ which it may alter in any way." :group 'gnus-summary :type 'regexp) +(defcustom gnus-summary-to-prefix "-> " + "*String prefixed to the To field in the summary line when +using `gnus-ignored-from-addresses'." + :version "22.1" + :group 'gnus-summary + :type 'string) + +(defcustom gnus-summary-newsgroup-prefix "=> " + "*String prefixed to the Newsgroup field in the summary +line when using `gnus-ignored-from-addresses'." + :version "22.1" + :group 'gnus-summary + :type 'string) + (defcustom gnus-newsgroup-ignored-charsets '(unknown-8bit x-unknown) "List of charsets that should be ignored. When these charsets are used in the \"charset\" parameter, the @@ -3359,12 +3373,12 @@ buffer that was in action when the last article was fetched." newsgroups) (cond ((setq to (cdr (assq 'To extra-headers))) - (concat "-> " + (concat gnus-summary-to-prefix (inline (gnus-summary-extract-address-component (funcall gnus-decode-encoded-word-function to))))) ((setq newsgroups (cdr (assq 'Newsgroups extra-headers))) - (concat "=> " newsgroups))))) + (concat gnus-summary-newsgroup-prefix newsgroups))))) (inline (gnus-summary-extract-address-component gnus-tmp-from))))) (defun gnus-summary-insert-line (gnus-tmp-header diff --git a/texi/ChangeLog b/texi/ChangeLog index f9483ed..2298b48 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,10 @@ +2005-07-18 Romain Francoise + + * gnus.texi (To From Newsgroups): Mention new variables + `gnus-summary-to-prefix' and `gnus-summary-newsgroup-prefix'. + + * gnus-news.texi: Ditto. + 2005-06-29 Katsumi Yamaoka * gnus.texi (NoCeM): gnus-nocem-verifyer defaults to pgg-verify. diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index bcc83a9..80e2613 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -4668,7 +4668,14 @@ Gnus は変数 @code{gnus-extract-address-components} の値を @code{From @code{gnus-ignored-from-addresses} 変数はいつ @samp{%f} 概略行仕様 が @code{To}, @code{Newsreader} や @code{From} ヘッダーを返せば良いかを 決めます。この正規表現が @code{From} ヘッダーの内容と合致すると、 -@code{To} や @code{Newsreader} ヘッダーが代わりに仕様されます。 +@code{To} や @code{Newsreader} ヘッダーが代わりに使用されます。 + +それらの @code{From} フィールドが入れ替わっている記事と、普通の記事を区 +別するために、概略行の @code{To} または @code{Newsgroups} ヘッダに、ある +文字列が前置されます。その文字列はディフォルトで、@code{To} に +は @samp{-> } が、@code{Newsgroups} には @samp{=> } が使われますが、 +@code{gnus-summary-to-prefix} と @code{gnus-summary-newsgroup-prefix} に +よって、それらの文字列をカスタマイズすることができます。 @end enumerate diff --git a/texi/gnus-news.texi b/texi/gnus-news.texi index 8735904..d14b0fb 100644 --- a/texi/gnus-news.texi +++ b/texi/gnus-news.texi @@ -109,7 +109,7 @@ See the Gnus manual, section Hashcash, for more information. Use @item Gnus supports a new sort command in the Summary buffer: @kbd{C-c C-s C-t} (@code{gnus-summary-sort-by-recipient}). @ref{Summary -Sorting} +Sorting}. @item The @code{nnrss} back end now supports multilingual text. Non-@acronym{ASCII} group names for the @code{nnrss} groups are also @@ -128,5 +128,10 @@ This allows to decay only adaptive score files. @ref{Score Decays}. @item @acronym{S/MIME} now feature @acronym{LDAP} user certificate searches. You need to configure the server in @code{smime-ldap-host-list}. +@item Strings prefixed to the @code{To} and @code{Newsgroup} headers in +summary lines when using @code{gnus-ignored-from-addresses} can be +customized with @code{gnus-summary-to-prefix} and +@code{gnus-summary-newsgroup-prefix}. @ref{To From Newsgroups}. + @end itemize @c gnus-news.texi ends here. diff --git a/texi/gnus.texi b/texi/gnus.texi index 198a648..0f21ad8 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -4764,6 +4764,13 @@ summary line spec returns the @code{To}, @code{Newsreader} or @code{From} header, the value of the @code{To} or @code{Newsreader} headers are used instead. +To distinguish regular articles from those where the @code{From} field +has been swapped, a string is prefixed to the @code{To} or +@code{Newsgroups} header in the summary line. By default the string is +@samp{-> } for @code{To} and @samp{=> } for @code{Newsgroups}, you can +customize these strings with @code{gnus-summary-to-prefix} and +@code{gnus-summary-newsgroup-prefix}. + @end enumerate @vindex nnmail-extra-headers -- 1.7.10.4