Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-314

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 69)

   - Update from CVS

2005-05-16  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-art.el: Don't autoload mail-extract-address-components.

   * lisp/gnus/gnus.el: Use eval-and-compile to autoload message-y-or-n-p.

   * lisp/gnus/nndb.el: Don't declare the nndb back end two or more times; don't
   autoload news-reply-mode, news-setup, cancel-timer and telnet.

   * lisp/gnus/nntp.el: Autoload format-spec instead of format; use
   eval-and-compile to evaluate autoload forms.

   * lisp/gnus/spam-report.el (spam-report-process-queue): Use gnus-point-at-eol.

6 files changed, 30 insertions, 23 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 9f3a114adbe..14450ee3a14 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,17 @@
+2005-05-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-art.el: Don't autoload mail-extract-address-components.
+
+        * gnus.el: Use eval-and-compile to autoload message-y-or-n-p.
+
+        * nndb.el: Don't declare the nndb back end two or more times; don't
+        autoload news-reply-mode, news-setup, cancel-timer and telnet.
+
+        * nntp.el: Autoload format-spec instead of format; use
+        eval-and-compile to evaluate autoload forms.
+
+        * spam-report.el (spam-report-process-queue): Use gnus-point-at-eol.
+
 2005-04-28  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus-art.el (article-date-ut): Support converting date in
@@ -345,9 +359,6 @@
 
         * gnus-async.el: Ditto.
 
-        * dgnushack.el: No need to ignore `run-with-idle-timer', XEmacs
-        has this function now.
-
 2005-03-16  Lute Kamstra  <lute@gnu.org>
 
         * message.el (message-make-date): Require parse-time.
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 55aaed15d90..b1a51d65edd 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -481,9 +481,6 @@ be fed to `format-time-string'."
   :link '(custom-manual "(gnus)Article Date")
   :group 'gnus-article-washing)
 
-(eval-and-compile
-  (autoload 'mail-extract-address-components "mail-extr"))
-
 (defcustom gnus-save-all-headers t
   "*If non-nil, don't remove any headers before saving."
   :group 'gnus-article-saving
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 3112a07cb2e..98c41de45e5 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -1,7 +1,7 @@
 ;;; gnus.el --- a newsreader for GNU Emacs
 
 ;; Copyright (C) 1987, 1988, 1989, 1990, 1993, 1994, 1995, 1996, 1997,
-;; 1998, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+;; 1998, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;;      Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -34,7 +34,6 @@
 (require 'wid-edit)
 (require 'mm-util)
 (require 'nnheader)
-(autoload 'message-y-or-n-p "message" nil nil 'macro)
 
 (defgroup gnus nil
   "The coffee-brewing, all singing, all dancing, kitchen sink newsreader."
@@ -3925,6 +3924,9 @@ If NEWSGROUP is nil, return the global kill file name instead."
       (setq valids (cdr valids)))
     outs))
 
+(eval-and-compile
+  (autoload 'message-y-or-n-p "message" nil nil 'macro))
+
 (defun gnus-read-group (prompt &optional default)
   "Prompt the user for a group name.
 Disallow invalid group names."
diff --git a/lisp/gnus/nndb.el b/lisp/gnus/nndb.el
index bd8523f11b2..6aaf57c81e1 100644
--- a/lisp/gnus/nndb.el
+++ b/lisp/gnus/nndb.el
@@ -1,6 +1,7 @@
 ;;; nndb.el --- nndb access for Gnus
 
-;; Copyright (C) 1997, 1998, 2000, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 2000, 2003, 2004, 2005
+;;        Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;;         Kai Grossjohann <grossjohann@ls6.informatik.uni-dortmund.de>
@@ -50,7 +51,9 @@
 ;;-
 ;; Register nndb with known select methods.
 
-(gnus-declare-backend "nndb" 'mail 'respool 'address 'prompt-address)
+(require 'gnus-start)
+(unless (assoc "nndb" gnus-valid-select-methods)
+  (gnus-declare-backend "nndb" 'mail 'respool 'address 'prompt-address))
 
 ;;; Code:
 
@@ -59,14 +62,6 @@
 (require 'nntp)
 (eval-when-compile (require 'cl))
 
-(eval-and-compile
-  (autoload 'news-setup "rnewspost")
-  (autoload 'news-reply-mode "rnewspost")
-  (autoload 'cancel-timer "timer")
-  (autoload 'telnet "telnet" nil t)
-  (autoload 'telnet-send-input "telnet" nil t)
-  (autoload 'gnus-declare-backend "gnus-start"))
-
 ;; Declare nndb as derived from nntp
 
 (nnoo-declare nndb nntp)
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index 8a10600fcb8..ab85ad25931 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -1,7 +1,8 @@
 ;;; nntp.el --- nntp access for Gnus
 
 ;; Copyright (C) 1987, 1988, 1989, 1990, 1992, 1993, 1994, 1995, 1996,
-;; 1997, 1998, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+;; 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005
+;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
@@ -1147,9 +1148,10 @@ password contained in '~/.nntp-authinfo'."
 (defun nntp-open-network-stream (buffer)
   (open-network-stream "nntpd" buffer nntp-address nntp-port-number))
 
-(autoload 'format-spec "format")
-(autoload 'format-spec-make "format")
-(autoload 'open-tls-stream "tls")
+(eval-and-compile
+  (autoload 'format-spec "format-spec")
+  (autoload 'format-spec-make "format-spec")
+  (autoload 'open-tls-stream "tls"))
 
 (defun nntp-open-ssl-stream (buffer)
   (let* ((process-connection-type nil)
diff --git a/lisp/gnus/spam-report.el b/lisp/gnus/spam-report.el
index b8283ffaaa8..59119dc5438 100644
--- a/lisp/gnus/spam-report.el
+++ b/lisp/gnus/spam-report.el
@@ -159,7 +159,7 @@ symbol `ask', query before flushing the queue file."
     (goto-char (point-min))
     (while (and (not (eobp))
                 (re-search-forward
-                 "http://\\([^/]+\\)\\(/.*\\) *$" (point-at-eol) t))
+                 "http://\\([^/]+\\)\\(/.*\\) *$" (gnus-point-at-eol) t))
       (funcall spam-report-url-ping-function (match-string 1) (match-string 2))
       (forward-line 1))
     (if (or (eq keep nil)