Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 271)

   - Update from CVS

2007-12-14  Johan Bockg\e,Ae\e(Brd  <bojohan@gnu.org>

   * lisp/gnus-sum.el (gnus-summary-mark-unread-as-read)
   (gnus-summary-mark-read-and-unread-as-read)
   (gnus-summary-mark-current-read-and-unread-as-read)
   (gnus-summary-mark-unread-as-ticked): Doc fix.
   `gnus-mark-article-hook', not `gnus-summary-mark-article-hook'.

2007-12-14  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus-sum.el (gnus-summary-prev-article): Fix doc string. Reported by
   Christoph Conrad <christoph.conrad@gmx.de>.

2007-12-14  Sven Joachim  <svenjoac@gmx.de>

   * texi/gnus.texi (Score Variables): Fix typo.

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 763fee3..18aeb3a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5,6 +5,19 @@
        (gnus-mime-delete-part): Don't write description line if empty.
        (gnus-article-encrypt-body): Add confirmation for gnus-novice-user.
 
+2007-12-14  Johan Bockg\e,Ae\e(Brd  <bojohan@gnu.org>
+
+       * gnus-sum.el (gnus-summary-mark-unread-as-read)
+       (gnus-summary-mark-read-and-unread-as-read)
+       (gnus-summary-mark-current-read-and-unread-as-read)
+       (gnus-summary-mark-unread-as-ticked): Doc fix.
+       `gnus-mark-article-hook', not `gnus-summary-mark-article-hook'.
+
+2007-12-14  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * gnus-sum.el (gnus-summary-prev-article): Fix doc string.  Reported by
+       Christoph Conrad <christoph.conrad@gmx.de>.
+
 2007-12-14  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * gnus-util.el (gnus-y-or-n-p, gnus-yes-or-no-p): Alias to y-or-n-p and

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 72a7903..f86cf22 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -7653,7 +7653,7 @@ If BACKWARD, the previous article is selected instead of the next."
        (gnus-summary-article-subject))))
 
 (defun gnus-summary-prev-article (&optional unread subject)
-  "Select the article after the current one.
+  "Select the article before the current one.
 If UNREAD is non-nil, only unread articles are selected."
   (interactive "P")
   (gnus-summary-next-article unread subject t))
@@ -10823,12 +10823,12 @@ The difference between N and the number of marks cleared is returned."
   (gnus-summary-mark-forward (- n) gnus-unread-mark))
 
 (defun gnus-summary-mark-unread-as-read ()
-  "Intended to be used by `gnus-summary-mark-article-hook'."
+  "Intended to be used by `gnus-mark-article-hook'."
   (when (memq gnus-current-article gnus-newsgroup-unreads)
     (gnus-summary-mark-article gnus-current-article gnus-read-mark)))
 
 (defun gnus-summary-mark-read-and-unread-as-read (&optional new-mark)
-  "Intended to be used by `gnus-summary-mark-article-hook'."
+  "Intended to be used by `gnus-mark-article-hook'."
   (let ((mark (gnus-summary-article-mark)))
     (when (or (gnus-unread-mark-p mark)
              (gnus-read-mark-p mark))
@@ -10836,7 +10836,7 @@ The difference between N and the number of marks cleared is returned."
                                 (or new-mark gnus-read-mark)))))
 
 (defun gnus-summary-mark-current-read-and-unread-as-read (&optional new-mark)
-  "Intended to be used by `gnus-summary-mark-article-hook'."
+  "Intended to be used by `gnus-mark-article-hook'."
   (let ((mark (gnus-summary-article-mark)))
     (when (or (gnus-unread-mark-p mark)
              (gnus-read-mark-p mark))
@@ -10844,7 +10844,7 @@ The difference between N and the number of marks cleared is returned."
                                 (or new-mark gnus-read-mark)))))
 
 (defun gnus-summary-mark-unread-as-ticked ()
-  "Intended to be used by `gnus-summary-mark-article-hook'."
+  "Intended to be used by `gnus-mark-article-hook'."
   (when (memq gnus-current-article gnus-newsgroup-unreads)
     (gnus-summary-mark-article gnus-current-article gnus-ticked-mark)))
 

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 2553ffa..752582c 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-14  Sven Joachim  <svenjoac@gmx.de>
+
+       * gnus.texi (Score Variables): Fix typo.
+
 2007-12-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus.texi (Other Files): Add the yenc command.

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 795e424..cf97106 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -20529,7 +20529,7 @@ Suffix to add to the group name to arrive at the score file name
 @vindex gnus-score-uncacheable-files
 @cindex score cache
 All score files are normally cached to avoid excessive re-loading of
-score files.  However, if this might make your Emacs grow big and
+score files.  However, this might make your Emacs grow big and
 bloated, so this regexp can be used to weed out score files unlikely
 to be needed again.  It would be a bad idea to deny caching of
 @file{all.SCORE}, while it might be a good idea to not cache