# HG changeset patch # User Miles Bader # Date 1127683593 0 # Node ID cb3218d6e82acb462efd1bfe595c66a2d8195eac # Parent dc239a66e60064fbe187e9b4020643382fcbc0e7 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-561 Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 122-124) - Update from CVS: lisp/mm-url.el (mm-url-decode-entities): Fix regexp. - Update from CVS 2005-09-22 Reiner Steib * lisp/gnus/spam-report.el (spam-report-url-ping-plain): Use gnus-extended-version as User-Agent. * lisp/gnus/gnus-agent.el (gnus-agent-synchronize-flags): Explain why the default value is nil. 2005-09-20 Lars Magne Ingebrigtsen * lisp/gnus/gnus-agent.el (gnus-agent-synchronize-flags): Switch the default to nil, to be able to use Gnus at all. If the default switches to something else, then the function should be fixed not be exceedingly slow. 2005-09-19 Reiner Steib * lisp/gnus/mm-url.el (mm-url-decode-entities): Fix regexp. 2005-09-22 Katsumi Yamaoka * man/gnus.texi (Mail): Fix gnus-confirm-mail-reply-to-news entry. diff -r dc239a66e600 -r cb3218d6e82a lisp/gnus/ChangeLog --- a/lisp/gnus/ChangeLog Sun Sep 25 01:49:13 2005 +0000 +++ b/lisp/gnus/ChangeLog Sun Sep 25 21:26:33 2005 +0000 @@ -20,6 +20,25 @@ * message.el (message-check-news-header-syntax): Follow convention for reading with the minibuffer. +2005-09-22 Reiner Steib + + * spam-report.el (spam-report-url-ping-plain): Use + gnus-extended-version as User-Agent. + + * gnus-agent.el (gnus-agent-synchronize-flags): Explain why the + default value is nil. + +2005-09-20 Lars Magne Ingebrigtsen + + * gnus-agent.el (gnus-agent-synchronize-flags): Switch the + default to nil, to be able to use Gnus at all. If the default + switches to something else, then the function should be fixed not + be exceedingly slow. + +2005-09-19 Reiner Steib + + * mm-url.el (mm-url-decode-entities): Fix regexp. + 2005-09-18 D Goel * sieve.el (sieve-help): Fix `message' call: first arg should be a diff -r dc239a66e600 -r cb3218d6e82a lisp/gnus/gnus-agent.el --- a/lisp/gnus/gnus-agent.el Sun Sep 25 01:49:13 2005 +0000 +++ b/lisp/gnus/gnus-agent.el Sun Sep 25 21:26:33 2005 +0000 @@ -118,6 +118,8 @@ (defcustom gnus-agent-synchronize-flags t "Indicate if flags are synchronized when you plug in. If this is `ask' the hook will query the user." + ;; If the default switches to something else than nil, then the function + ;; should be fixed not be exceedingly slow. See 2005-09-20 ChangeLog entry. :version "21.1" :type '(choice (const :tag "Always" t) (const :tag "Never" nil) diff -r dc239a66e600 -r cb3218d6e82a lisp/gnus/mm-url.el --- a/lisp/gnus/mm-url.el Sun Sep 25 01:49:13 2005 +0000 +++ b/lisp/gnus/mm-url.el Sun Sep 25 21:26:33 2005 +0000 @@ -365,7 +365,7 @@ (defun mm-url-decode-entities () "Decode all HTML entities." (goto-char (point-min)) - (while (re-search-forward "&\\(#[0-9]+\\|[a-z]+\\);" nil t) + (while (re-search-forward "&\\(#[0-9]+\\|[a-z]+[0-9]*\\);" nil t) (let ((elem (if (eq (aref (match-string 1) 0) ?\#) (let ((c (string-to-number (substring diff -r dc239a66e600 -r cb3218d6e82a lisp/gnus/spam-report.el --- a/lisp/gnus/spam-report.el Sun Sep 25 01:49:13 2005 +0000 +++ b/lisp/gnus/spam-report.el Sun Sep 25 21:26:33 2005 +0000 @@ -150,7 +150,7 @@ (process-send-string tcp-connection (format "GET %s HTTP/1.1\nUser-Agent: %s (spam-report.el)\nHost: %s\n\n" - report (gnus-emacs-version) host))))) + report (gnus-extended-version) host))))) ;;;###autoload (defun spam-report-process-queue (&optional file keep) diff -r dc239a66e600 -r cb3218d6e82a man/ChangeLog --- a/man/ChangeLog Sun Sep 25 01:49:13 2005 +0000 +++ b/man/ChangeLog Sun Sep 25 21:26:33 2005 +0000 @@ -1,3 +1,7 @@ +2005-09-22 Katsumi Yamaoka + + * gnus.texi (Mail): Fix gnus-confirm-mail-reply-to-news entry. + 2005-09-20 Emanuele Giaquinta (tiny change) * text.texi (Paragraphs): Correction about Paragraph-Indent Text mode. diff -r dc239a66e600 -r cb3218d6e82a man/gnus.texi --- a/man/gnus.texi Sun Sep 25 01:49:13 2005 +0000 +++ b/man/gnus.texi Sun Sep 25 21:26:33 2005 +0000 @@ -11431,13 +11431,15 @@ @item gnus-confirm-mail-reply-to-news @vindex gnus-confirm-mail-reply-to-news -This can also be a function receiving the group name as the only -parameter which should return non-@code{nil} if a confirmation is -needed, or a regular expression matching group names, where -confirmation is should be asked for. +If non-@code{nil}, Gnus will ask you for a confirmation when you are +about to reply to news articles by mail. If it is @code{nil}, nothing +interferes in what you want to do. This can also be a function +receiving the group name as the only parameter which should return +non-@code{nil} if a confirmation is needed, or a regular expression +matching group names, where confirmation should be asked for. If you find yourself never wanting to reply to mail, but occasionally -press R anyway, this variable might be for you. +press @kbd{R} anyway, this variable might be for you. @item gnus-confirm-treat-mail-like-news @vindex gnus-confirm-treat-mail-like-news