Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 184-185)

   - Update from CVS
   - Merge from emacs--devo--0

2006-12-30  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>

   * lisp/gnus/gnus-sum.el (gnus-summary-insert-dormant-articles): Fix typo in
   message.

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

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index d7716e8d95073c42034ac274b30ba8b4b3cae7a2..b6b8b1b9bacd3640529111ea7ebaa8699c094a58 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-30  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
+
+       * gnus-sum.el (gnus-summary-insert-dormant-articles): Fix typo in
+       message.
+
 2006-12-29  Jouni K. Sepp\e,Ad\e(Bnen  <jks@iki.fi>
 
        * nnimap.el (nnimap-expunge-search-string): Mention

diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 2ac6ee0c3c7822070b8ca233262642e50e55dc3a..547455111290b2c6dbfb1d231270bf32684f81ce 100644 (file)
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -7990,7 +7990,7 @@ article."
   (interactive)
   (let ((gnus-verbose (max 6 gnus-verbose)))
     (if (not gnus-newsgroup-dormant)
-       (gnus-message 3 "No cached articles for this group")
+       (gnus-message 3 "No dormant articles for this group")
       (gnus-summary-goto-subjects gnus-newsgroup-dormant))))
 
 (defun gnus-summary-limit-include-dormant ()