From ebbeed623cb9902e520fc67d6d271e222e16867f Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Thu, 14 Oct 2004 07:33:19 +0000 Subject: [PATCH] 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 --- lisp/gnus/ChangeLog | 11 +++++++++++ lisp/gnus/message.el | 4 ++-- man/ChangeLog | 4 ++++ man/gnus-faq.texi | 11 +++++++---- 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 782c2a260a..292d36ce9e 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,14 @@ +2004-10-13 Katsumi Yamaoka + + * message.el (message-tokenize-header): Fix 2004-09-06 change + which used point-min in the wrong place. + +2004-10-12 Simon Josefsson + + * net/tls.el (tls-certtool-program): New variable. + (tls-certificate-information): New function, based on + ssl-certificate-information. + 2004-10-10 Reiner Steib * 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 bfaf167570..c9d05d1a0f 100644 --- 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 09308d99ba..8aec01712e 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,7 @@ +2004-10-12 Reiner Steib + + * gnus-faq.texi ([5.9]): Improve code for reply-in-news. + 2004-10-12 Michael Albinus Sync with Tramp 2.0.45. diff --git a/man/gnus-faq.texi b/man/gnus-faq.texi index 6f0fddc556..5d243f8a02 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 -- 2.20.1