Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-546

Merge from gnus--rel--5.10

Patches applied:

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-25
 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-26
   Update from CVS

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 783124f79594d7ba6033396e4764417e8b0e4f4c..668607af94d203d3786ddd744b75003a00bb7985 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-13  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * gnus-sum.el (gnus-summary-copy-article): Fixed doc string.
+
 2004-09-10  Miles Bader  <miles@gnu.ai.mit.edu>
 
        * nnimap.el (nnimap-open-connection): Remove extraneous end-paren.
@@ -404,12 +408,14 @@
        * gnus-cus.el: Merged revisions 7.2 through 7.5 into branch to support
        gnus-agent.el update and incorporate bug fixes.
 
-;; Local Variables:
-;; coding: iso-2022-7bit
-;; End:
+See ChangeLog.2 for earlier changes.
 
-    Copyright (C) 2002 2004 Free Software Foundation, Inc.
+    Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
+;; Local Variables:
+;; coding: iso-2022-7bit
+;; End:
+
 ;;; arch-tag: 3f33a3e7-090d-492b-bedd-02a1417d32b4

diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2
index c36aad0a6e953c4373af06d10262a59a57be731e..2dbd6d306dd73323882640af4f0a24a6356851e3 100644 (file)
--- a/lisp/gnus/ChangeLog.2
+++ b/lisp/gnus/ChangeLog.2
@@ -18913,12 +18913,18 @@
        * smime.el: New file.
        * mml-smime.el: New file.
 
-;; Local Variables:
-;; coding: iso-2022-7bit
-;; End:
+2000-10-27 19:42:12  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * ChangeLog: Moved to ChangeLog.1.
+
+See ChangeLog.1 for earlier changes.
 
-    Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+    Copyright (C) 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
-;; arch-tag: 13460c90-d3bc-4be2-9e15-c7c271d0c1eb
+;; Local Variables:
+;; coding: iso-2022-7bit
+;; End:
+
+;; arch-tag: 956fd310-042f-4fca-8dca-a01dbe06acff

diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 77d5037b32d5c201156b3d4bd37e23f3461952fd..02757fff4dda7adc37637ed1b04394d44d71a2b0 100644 (file)
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -9056,8 +9056,8 @@ ACTION can be either `move' (the default), `crosspost' or `copy'."
     (gnus-set-mode-line 'summary)))
 
 (defun gnus-summary-copy-article (&optional n to-newsgroup select-method)
-  "Move the current article to a different newsgroup.
-If TO-NEWSGROUP is string, do not prompt for a newsgroup to move to.
+  "Copy the current article to some other group.
+If TO-NEWSGROUP is string, do not prompt for a newsgroup to copy to.
 When called interactively, if TO-NEWSGROUP is nil, use the value of
 the variable `gnus-move-split-methods' for finding a default target
 newsgroup.