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

Merge from gnus--rel--5.10

Patches applied:

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

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-47
   Merge from emacs--cvs-trunk--0

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

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-49
   Add {arch}/=commit-merge-make-log

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-50
   {arch}/=commit-merge-make-log: Don't die if there are no ChangeLog changes

2 files changed, 11 insertions, 4 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index 09308d99ba6..8aec01712ef 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-12  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus-faq.texi ([5.9]): Improve code for reply-in-news.
+
 2004-10-12  Michael Albinus  <michael.albinus@gmx.de>
 
         Sync with Tramp 2.0.45.
diff --git a/man/gnus-faq.texi b/man/gnus-faq.texi
index 6f0fddc5562..5d243f8a02e 100644
--- a/man/gnus-faq.texi
+++ b/man/gnus-faq.texi
@@ -1776,11 +1776,14 @@ Answer:
  
 
 @example
-(defadvice gnus-summary-reply (around reply-in-news activate)
+(eval-after-load "gnus-msg"
+  '(unless (boundp 'gnus-confirm-mail-reply-to-news)
+     (defadvice gnus-summary-reply (around reply-in-news activate)
+       "Request confirmation when replying to news."
        (interactive)
-        (when (or (not (gnus-news-group-p gnus-newsgroup-name))
-                  (y-or-n-p "Really reply? "))
-         ad-do-it))
+       (when (or (not (gnus-news-group-p gnus-newsgroup-name))
+                 (y-or-n-p "Really reply by mail to article author? "))
+         ad-do-it))))
 @end example
  
 @ifnottex