Mercurial > emacs
changeset 57088:46f0c98a04a2
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
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 13 Sep 2004 16:01:26 +0000 |
parents | be3afbddb35b |
children | e3616b62370a 6d9b668e8f94 |
files | lisp/gnus/ChangeLog lisp/gnus/ChangeLog.2 lisp/gnus/gnus-sum.el |
diffstat | 3 files changed, 23 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Mon Sep 13 13:42:00 2004 +0000 +++ b/lisp/gnus/ChangeLog Mon Sep 13 16:01:26 2004 +0000 @@ -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. +See ChangeLog.2 for earlier changes. + + 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: - Copyright (C) 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: 3f33a3e7-090d-492b-bedd-02a1417d32b4
--- a/lisp/gnus/ChangeLog.2 Mon Sep 13 13:42:00 2004 +0000 +++ b/lisp/gnus/ChangeLog.2 Mon Sep 13 16:01:26 2004 +0000 @@ -18913,12 +18913,18 @@ * smime.el: New file. * mml-smime.el: New file. +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) 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. + ;; Local Variables: ;; coding: iso-2022-7bit ;; End: - Copyright (C) 2002, 2003, 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 +;; arch-tag: 956fd310-042f-4fca-8dca-a01dbe06acff
--- a/lisp/gnus/gnus-sum.el Mon Sep 13 13:42:00 2004 +0000 +++ b/lisp/gnus/gnus-sum.el Mon Sep 13 16:01:26 2004 +0000 @@ -9056,8 +9056,8 @@ (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.