Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 198-199)

   - Update from CVS

2007-01-28  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>

   * lisp/nnslashdot.el (nnslashdot-request-article): Update end-of-article
   regexp.

2007-01-28  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>

   * texi/gnus.texi (Batching Agents): Fix example. Reported by Tassilo Horn
   <tassilo@member.fsf.org>.

Revision: emacs@sv.gnu.org/gnus--devo--0--patch-285

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 777159f..1064b20 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-28  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
+
+       * nnslashdot.el (nnslashdot-request-article): Update end-of-article
+       regexp.
+
 2007-01-24  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * uudecode.el (uudecode-string-to-multibyte): New function emulating

diff --git a/lisp/nnslashdot.el b/lisp/nnslashdot.el
index 57c11eb..4e3cfac 100644 (file)
--- a/lisp/nnslashdot.el
+++ b/lisp/nnslashdot.el
@@ -259,7 +259,7 @@
                      (buffer-substring
                       (search-forward "<div class=\"commentBody\">")
                       (progn
-                        (search-forward "<div class=\"commentSub\">")
+                        (search-forward "<div class=\"commentSub\"")
                         (match-beginning 0))))))))
       (search-failed (nnslashdot-lose why)))
 

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 27a3a36..a14f9c2 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-28  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
+
+       * gnus.texi (Batching Agents): Fix example.  Reported by Tassilo Horn
+       <tassilo@member.fsf.org>.
+
 2007-01-13  Romain Francoise  <romain@orebokech.com>
 
        * gnus.texi (Mail Spool): Fix typo.

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 58c2565..d1923fa 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -19779,7 +19779,7 @@ following incantation:
 
 @example
 #!/bin/sh
-emacs -batch -l ~/.emacs -l ~/.gnus.el gnus-agent-batch >/dev/null 2>&1
+emacs -batch -l ~/.emacs -l ~/.gnus.el -f gnus-agent-batch >/dev/null 2>&1
 @end example