X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fnndir.el;h=f1a6635c69e79c6cade5f102798dc9582f064ce6;hb=41133b1a6f066420417a1a245b7dd5bf68a03178;hp=00467ba846616f91b4923a3de4dbe61da629a846;hpb=5f95797872c36b78091aefa44232be2c03ec1034;p=gnus diff --git a/lisp/nndir.el b/lisp/nndir.el index 00467ba84..f1a6635c6 100644 --- a/lisp/nndir.el +++ b/lisp/nndir.el @@ -1,7 +1,9 @@ ;;; nndir.el --- single directory newsgroup access for Gnus -;; Copyright (C) 1995,96,97 Free Software Foundation, Inc. -;; Author: Lars Magne Ingebrigtsen +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 +;; Free Software Foundation, Inc. + +;; Author: Lars Magne Ingebrigtsen ;; Keywords: news ;; This file is part of GNU Emacs. @@ -63,8 +65,6 @@ server)) (unless (assq 'nndir-directory defs) (push `(nndir-directory ,server) defs)) - ;(when (equal server "") - ; (setq server (cadr (assq 'nndir-directory defs)))) (push `(nndir-current-group ,(file-name-nondirectory (directory-file-name nndir-directory))) defs) @@ -73,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) @@ -90,11 +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) (nnml-close-group nndir-current-group 0) - (nnmh-request-list (nnoo-current-server 'nndir) nndir-directory) - (nnmh-request-newsgroups (nnoo-current-server 'nndir) nndir-directory)) + (nnml-request-list (nnoo-current-server 'nndir) nndir-directory) + (nnml-request-newsgroups (nnoo-current-server 'nndir) nndir-directory)) (provide 'nndir)