From 207ea2435f8ae7bbbf5413f54b0a25b0713970e5 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 11 Mar 2003 22:34:40 +0000 Subject: [PATCH] Synch to Oort Gnus 200303112120. --- contrib/ChangeLog | 5 +++++ contrib/hashcash.el | 16 +++++++--------- texi/ChangeLog | 4 ++++ texi/gnus-ja.texi | 13 +++++++------ texi/gnus.texi | 13 +++++++------ 5 files changed, 30 insertions(+), 21 deletions(-) diff --git a/contrib/ChangeLog b/contrib/ChangeLog index f10609a..4f6586b 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,8 @@ +2003-03-11 Teodor Zlatanov + + * hashcash.el (hashcash-version, hashcash-insert-payment): patch + from Paul Foley + 2003-03-07 Simon Josefsson * gnus-idna.el (gnus-idna-to-ascii-rhs-1): Narrow to diff --git a/contrib/hashcash.el b/contrib/hashcash.el index 7eef651..6966b21 100644 --- a/contrib/hashcash.el +++ b/contrib/hashcash.el @@ -128,22 +128,20 @@ is used instead.") ;; ;; Version 1.0 looked like nnnnnrrrrrxxxxxxxxxxxxxxxx ;; This is no longer supported. - (if token - (cond ((equal (aref token 1) ?:) 1.2) - ((equal (aref token 6) ?:) 1.1) - (t (error "Unknown hashcash format version"))) - nil)) + (cond ((equal (aref token 1) ?:) 1.2) + ((equal (aref token 6) ?:) 1.1) + (t (error "Unknown hashcash format version")))) ;;;###autoload (defun hashcash-insert-payment (arg) "Insert X-Payment and X-Hashcash headers with a payment for ARG" (interactive "sPay to: ") - (let* ((pay (hashcash-generate-payment (hashcash-payment-to arg) - (hashcash-payment-required arg))) - (version (hashcash-version pay))) + (let ((pay (hashcash-generate-payment (hashcash-payment-to arg) + (hashcash-payment-required arg)))) (when pay (insert-before-markers "X-Payment: hashcash " - (number-to-string version) " " pay "\n") + (number-to-string (hashcash-version pay)) " " + pay "\n") (insert-before-markers "X-Hashcash: " pay "\n")))) ;;;###autoload diff --git a/texi/ChangeLog b/texi/ChangeLog index 1dda493..0a07d20 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,7 @@ +2003-03-11 Jesper Harder + + * gnus.texi (Paging the Article): Addition. + 2003-03-10 Jesper Harder * gnus.texi (Customizing Articles): Additions. diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index 6a5ca08..57379d1 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -5076,12 +5076,13 @@ Summary Buffer} を参照して下さい。 次の記事を選択します (@code{gnus-summary-next-page})。 @vindex gnus-article-boring-faces -記事の残りに引用と署名しか無い場合、それはスキップされ、代わりに次の記事 -が表示されます。@code{gnus-article-boring-faces} で、つまらないと思うも -のをカスタマイズするか、または @code{nil} に設定することによって、この機 -能を働かないようにすることができます。どんなにうんざりするものでも、記事 -バッファで @kbd{C-v} を使うことによって、手動で記事のページを見ることは -できます。 +@vindex gnus-article-skip-boring +@code{gnus-article-skip-boring} が非-@code{nil} で、かつ記事の残りに引用 +と署名しか無い場合、それはスキップされ、代わりに次の記事が表示されます。 +@code{gnus-article-boring-faces} で、つまらないと思うものをカスタマイズ +するか、または @code{nil} に設定することによって、この機能を働かないよう +にすることができます。どんなにうんざりするものでも、@kbd{C-M-v} を使うこ +とによって、手動で記事のページを見ることはできます。 @item DEL @kindex DEL (概略) diff --git a/texi/gnus.texi b/texi/gnus.texi index fceefd3..e8cc825 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -5068,12 +5068,13 @@ or, if you have come to the end of the current article, will choose the next article (@code{gnus-summary-next-page}). @vindex gnus-article-boring-faces -If the rest of the article consists only of citations and signature, -then it will be skipped; the next article will be shown instead. You -can customize what is considered uninteresting with -@code{gnus-article-boring-faces}, or set it to @code{nil} to disable -this feature. You can manually view the article's pages, no matter how -boring, using @kbd{C-v} in the article buffer. +@vindex gnus-article-skip-boring +If @code{gnus-article-skip-boring} is non-@code{nil} and the rest of +the article consists only of citations and signature, then it will be +skipped; the next article will be shown instead. You can customize +what is considered uninteresting with +@code{gnus-article-boring-faces}. You can manually view the article's +pages, no matter how boring, using @kbd{C-M-v}. @item DEL @kindex DEL (Summary) -- 1.7.10.4