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

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 782c2a260a69496951f41d055c42628684f144e5..292d36ce9e11ad45e6b6fcd61362eac1361dc1ab 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,14 @@
+2004-10-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * message.el (message-tokenize-header): Fix 2004-09-06 change
+       which used point-min in the wrong place.
+
+2004-10-12  Simon Josefsson  <jas@extundo.com>
+
+       * net/tls.el (tls-certtool-program): New variable.
+       (tls-certificate-information): New function, based on
+       ssl-certificate-information.
+
 2004-10-10  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * gnus-sum.el: Mention that multibyte characters don't work as marks.

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index bfaf16757034665d3f7a8b3096bbb14be4e9b473..c9d05d1a0fe6983393a738739458857dc81d9f7c 100644 (file)
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -1615,11 +1615,11 @@ is used by default."
   (if (not header)
       nil
     (let ((regexp (format "[%s]+" (or separator ",")))
-         (beg (point-min))
          (first t)
-         quoted elems paren)
+         beg quoted elems paren)
       (with-temp-buffer
        (mm-enable-multibyte)
+       (setq beg (point-min))
        (insert header)
        (goto-char (point-min))
        (while (not (eobp))

diff --git a/man/ChangeLog b/man/ChangeLog
index 09308d99ba6ebfbd6d992d3f03ec3d9dca19d88a..8aec01712efc877b7a09096477d73d8c8bfef355 100644 (file)
--- 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 6f0fddc556264813ccb37cdb06d57ab75c593e64..5d243f8a02ea14fb8066af61b8702520f6acdbce 100644 (file)
--- 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