This commit was generated by cvs2svn to compensate for changes in r8000,

[elisp/gnus.git-] / lisp / nnlistserv.el

diff --git a/lisp/nnlistserv.el b/lisp/nnlistserv.el
index 666cd70..bb2b4a9 100644 (file)
--- a/lisp/nnlistserv.el
+++ b/lisp/nnlistserv.el
@@ -1,6 +1,5 @@
 ;;; nnlistserv.el --- retrieving articles via web mailing list archives
-
-;; Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1997,98 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news, mail
@@ -32,10 +31,7 @@
 (eval-when-compile (require 'cl))
 
 (require 'nnoo)
-(eval-when-compile
-  (ignore-errors
-   (require 'nnweb))                   ; requires W3
-  (autoload 'url-insert-file-contents "nnweb"))
+(require 'nnweb)
 
 (nnoo-declare nnlistserv
   nnweb)
@@ -49,15 +45,15 @@
   nnweb-type)
 
 (defvoo nnlistserv-type-definition
-    '((kk
-       (article . nnlistserv-kk-wash-article)
-       (map . nnlistserv-kk-create-mapping)
-       (search . nnlistserv-kk-search)
-       (address . "http://www.itk.ntnu.no/ansatte/Andresen_Trond/kk-f/%s/")
-       (pages "fra160396" "fra160796" "fra061196" "fra160197"
-             "fra090997" "fra040797" "fra130397" "nye")
-       (index . "date.html")
-       (identifier . nnlistserv-kk-identity)))
+  '((kk
+     (article . nnlistserv-kk-wash-article)
+     (map . nnlistserv-kk-create-mapping)
+     (search . nnlistserv-kk-search)
+     (address . "http://www.itk.ntnu.no/ansatte/Andresen_Trond/kk-f/%s/")
+     (pages "fra160396" "fra160796" "fra061196" "fra160197"
+           "fra090997" "fra040797" "fra130397" "nye")
+     (index . "date.html")
+     (identifier . nnlistserv-kk-identity)))
   "Type-definition alist."
   nnweb-type-definition)
 
@@ -115,7 +111,8 @@
                 nil 0 0 url))
               map)
              (nnweb-set-hashtb (cadar map) (car map))
-             (nnheader-message 5 "%s %s %s" (cdr active) (point) pages)))))
+             (nnheader-message 5 "%s %s %s" (cdr active) (point) pages)
+             ))))
       ;; Return the articles in the right order.
       (setq nnweb-articles
            (sort (nconc nnweb-articles map) 'car-less-than-car)))))
@@ -144,7 +141,7 @@
 
 (defun nnlistserv-kk-search (search)
   (url-insert-file-contents
-   (concat (format (nnweb-definition 'address) search)
+   (concat (format (nnweb-definition 'address) search) 
           (nnweb-definition 'index)))
   t)