Synch to Oort Gnus 200303112120.

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index f10609a..4f6586b 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-11  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * hashcash.el (hashcash-version, hashcash-insert-payment): patch
+       from Paul Foley
+
 2003-03-07  Simon Josefsson  <jas@extundo.com>
 
        * 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 (file)
--- 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 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-11  Jesper Harder  <harder@ifa.au.dk>
+
+       * gnus.texi (Paging the Article): Addition.
+
 2003-03-10  Jesper Harder  <harder@ifa.au.dk>
 
        * gnus.texi (Customizing Articles): Additions.

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 6a5ca08..57379d1 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -5076,12 +5076,13 @@ Summary Buffer} \e$B$r;2>H$7$F2<$5$$!#\e(B
 \e$B<!$N5-;v$rA*Br$7$^$9\e(B (@code{gnus-summary-next-page})\e$B!#\e(B
 
 @vindex gnus-article-boring-faces
-\e$B5-;v$N;D$j$K0zMQ$H=pL>$7$+L5$$>l9g!"$=$l$O%9%-%C%W$5$l!"Be$o$j$K<!$N5-;v\e(B
-\e$B$,I=<($5$l$^$9!#\e(B@code{gnus-article-boring-faces} \e$B$G!"$D$^$i$J$$$H;W$&$b\e(B
-\e$B$N$r%+%9%?%^%$%:$9$k$+!"$^$?$O\e(B @code{nil} \e$B$K@_Dj$9$k$3$H$K$h$C$F!"$3$N5!\e(B
-\e$BG=$rF/$+$J$$$h$&$K$9$k$3$H$,$G$-$^$9!#$I$s$J$K$&$s$6$j$9$k$b$N$G$b!"5-;v\e(B
-\e$B%P%C%U%!$G\e(B @kbd{C-v} \e$B$r;H$&$3$H$K$h$C$F!"<jF0$G5-;v$N%Z!<%8$r8+$k$3$H$O\e(B
-\e$B$G$-$^$9!#\e(B
+@vindex gnus-article-skip-boring
+@code{gnus-article-skip-boring} \e$B$,Hs\e(B-@code{nil} \e$B$G!"$+$D5-;v$N;D$j$K0zMQ\e(B
+\e$B$H=pL>$7$+L5$$>l9g!"$=$l$O%9%-%C%W$5$l!"Be$o$j$K<!$N5-;v$,I=<($5$l$^$9!#\e(B
+@code{gnus-article-boring-faces} \e$B$G!"$D$^$i$J$$$H;W$&$b$N$r%+%9%?%^%$%:\e(B
+\e$B$9$k$+!"$^$?$O\e(B @code{nil} \e$B$K@_Dj$9$k$3$H$K$h$C$F!"$3$N5!G=$rF/$+$J$$$h$&\e(B
+\e$B$K$9$k$3$H$,$G$-$^$9!#$I$s$J$K$&$s$6$j$9$k$b$N$G$b!"\e(B@kbd{C-M-v} \e$B$r;H$&$3\e(B
+\e$B$H$K$h$C$F!"<jF0$G5-;v$N%Z!<%8$r8+$k$3$H$O$G$-$^$9!#\e(B
 
 @item DEL
 @kindex DEL (\e$B35N,\e(B)

diff --git a/texi/gnus.texi b/texi/gnus.texi
index fceefd3..e8cc825 100644 (file)
--- 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)