diff lisp/gnus/nndb.el @ 62428:9f49da4a429d

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.
author Miles Bader <miles@gnu.org>
date Tue, 17 May 2005 04:57:29 +0000
parents 06f2ccbf6e0f
children 88db2adda4b7
line wrap: on
line diff
--- a/lisp/gnus/nndb.el	Tue May 17 00:28:50 2005 +0000
+++ b/lisp/gnus/nndb.el	Tue May 17 04:57:29 2005 +0000
@@ -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)