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  <Reiner.Steib@gmx.de>

   * 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  <larsi@gnus.org>

   * 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  <Reiner.Steib@gmx.de>

   * lisp/gnus/mm-url.el (mm-url-decode-entities): Fix regexp.

2005-09-22  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/gnus.texi (Mail): Fix gnus-confirm-mail-reply-to-news entry.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index b878be500bb28c36a0b7acbcf1cce6cc11847908..44675cdacd03c020272ea2e782a4207ce39fed57 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -20,6 +20,25 @@
        * message.el (message-check-news-header-syntax):
        Follow convention for reading with the minibuffer.
 
+2005-09-22  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * 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  <larsi@gnus.org>
+
+       * 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  <Reiner.Steib@gmx.de>
+
+       * mm-url.el (mm-url-decode-entities): Fix regexp.
+
 2005-09-18  D Goel  <deego@gnufans.org>
 
        * sieve.el (sieve-help): Fix `message' call: first arg should be a

diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index 0d024d06e11ed5fab777a1e7f1a1030c284aa153..0357ddd18cb288f11076f4ade893c4e3f27d7956 100644 (file)
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -118,6 +118,8 @@ If nil, only read articles will be expired."
 (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 --git a/lisp/gnus/mm-url.el b/lisp/gnus/mm-url.el
index 961ee0ea4fb2bf9aae45e6a1d71e1307d7c0836a..4fd39e477f698693f1a53bab9bea6645ded2ed8f 100644 (file)
--- a/lisp/gnus/mm-url.el
+++ b/lisp/gnus/mm-url.el
@@ -365,7 +365,7 @@ If FOLLOW-REFRESH is non-nil, redirect refresh url in META."
 (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 --git a/lisp/gnus/spam-report.el b/lisp/gnus/spam-report.el
index 173306ec55e7f6e4dfacebcdad0207f17ea2543a..293a41d7b60c930292eccebdabb71acc4474e306 100644 (file)
--- a/lisp/gnus/spam-report.el
+++ b/lisp/gnus/spam-report.el
@@ -150,7 +150,7 @@ the function specified by `spam-report-url-ping-function'."
       (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 --git a/man/ChangeLog b/man/ChangeLog
index 442c575134ac76f53e081e12d8591de5f27d1cd3..ee31882a963472edc4cbb31c08fe87efc02a09eb 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus.texi (Mail): Fix gnus-confirm-mail-reply-to-news entry.
+
 2005-09-20  Emanuele Giaquinta  <emanuele.giaquinta@gmail.com>  (tiny change)
 
        * text.texi (Paragraphs): Correction about Paragraph-Indent Text mode.

diff --git a/man/gnus.texi b/man/gnus.texi
index df3b4bf706b2d3e71a0b1922cb4909161c1799aa..c6b11716ba0845e0e4095cd76c83fc0b7421ddce 100644 (file)
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -11431,13 +11431,15 @@ that have none when you do a @kbd{a}.
 
 @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