Merge changes in Emacs21.

[gnus] / lisp / nndir.el

diff --git a/lisp/nndir.el b/lisp/nndir.el
index 4553109..f1a6635 100644 (file)
--- a/lisp/nndir.el
+++ b/lisp/nndir.el
@@ -1,7 +1,9 @@
 ;;; nndir.el --- single directory newsgroup access for Gnus
-;; Copyright (C) 1995,96 Free Software Foundation, Inc.
 
-;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000
+;;     Free Software Foundation, Inc.
+
+;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
 
 ;; This file is part of GNU Emacs.
@@ -71,12 +73,12 @@
        defs)
   (nnoo-change-server 'nndir server defs)
   (let (err)
-    (cond 
+    (cond
      ((not (condition-case arg
               (file-exists-p nndir-directory)
             (ftp-error (setq err (format "%s" arg)))))
       (nndir-close-server)
-      (nnheader-report 
+      (nnheader-report
        'nndir (or err "No such file or directory: %s" nndir-directory)))
      ((not (file-directory-p (file-truename nndir-directory)))
       (nndir-close-server)
@@ -88,14 +90,11 @@
 
 (nnoo-map-functions nndir
   (nnml-retrieve-headers 0 nndir-current-group 0 0)
-  (nnmh-request-article 0 nndir-current-group 0 0)
+  (nnml-request-article 0 nndir-current-group 0 0)
   (nnmh-request-group nndir-current-group 0 0)
-  (nnmh-close-group nndir-current-group 0))
-
-(nnoo-import nndir
-  (nnmh
-   nnmh-request-list
-   nnmh-request-newgroups))
+  (nnml-close-group nndir-current-group 0)
+  (nnml-request-list (nnoo-current-server 'nndir) nndir-directory)
+  (nnml-request-newsgroups (nnoo-current-server 'nndir) nndir-directory))
 
 (provide 'nndir)