Merge from gnus--rel--5.10

Revision: emacs@sv.gnu.org/emacs--rel--22--patch-164

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index aa410f541bdf61fb187bb38dcc11c6effefd6084..83449d6f00584716caa329c7c063ec2b0baa7280 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,16 @@
+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-03  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * message.el (message-ignored-supersedes-headers): Add "X-ID".

diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 96f7ea11c5d8abde9b7863a143d571ecabfba150..7b65743aac58a4a7fd118ab9df73772389615f26 100644 (file)
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -7492,7 +7492,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))
@@ -10393,12 +10393,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))
@@ -10406,7 +10406,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))
@@ -10414,7 +10414,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/man/ChangeLog b/man/ChangeLog
index 7a3253b31c5384867de8bebfdeb730894a6c2074..c6fab4340b8bfc5165484c019f68fb13534869bb 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-14  Sven Joachim  <svenjoac@gmx.de>
+
+       * gnus.texi (Score Variables): Fix typo.
+
 2007-12-15  Richard Stallman  <rms@gnu.org>
 
        * files.texi (Auto Save): Clarify definition of auto-saving.

diff --git a/man/gnus.texi b/man/gnus.texi
index bcced071cc26a201f7cc13b112d2a50c684aefb8..5ced5e29a99efa0fa4c9944ea5f414f8d6de3d03 100644 (file)
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -19900,7 +19900,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