Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 115-117)

   - Update from CVS

2006-07-17  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus-sum.el (gnus-summary-delete-article): Don't use TAB in doc
   string.

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fb8a308..2cfe217 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-17  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * gnus-sum.el (gnus-summary-delete-article): Don't use TAB in doc
+       string.
+
 2006-07-16  NAKAJI Hiroyuki  <nakaji@heimat.jp>  (tiny change)
 
        * mm-util.el (mm-charset-synonym-alist): Map windows-31j to cp932.

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 25fef12..06e4ea3 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -9734,7 +9734,7 @@ deleted forever, right now."
 ;; Suggested by Jack Vinson <vinson@unagi.cis.upenn.edu>.
 (defun gnus-summary-delete-article (&optional n)
   "Delete the N next (mail) articles.
-This command actually deletes articles.         This is not a marking
+This command actually deletes articles.  This is not a marking
 command.  The article will disappear forever from your life, never to
 return.