X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fnndir.el;h=736f37c1fa58502bc278a63277a1cb162c315ec9;hb=05dbdb660ffa497f5fce23f35c8e45d7a0843d39;hp=00467ba846616f91b4923a3de4dbe61da629a846;hpb=5f95797872c36b78091aefa44232be2c03ec1034;p=gnus

diff --git a/lisp/nndir.el b/lisp/nndir.el
index 00467ba84..736f37c1f 100644
--- a/lisp/nndir.el
+++ b/lisp/nndir.el
@@ -1,15 +1,16 @@
 ;;; nndir.el --- single directory newsgroup access for Gnus
-;; Copyright (C) 1995,96,97 Free Software Foundation, Inc.
 
-;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
+;; Copyright (C) 1995-2011 Free Software Foundation, Inc.
+
+;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,9 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -63,8 +62,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 +70,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 +87,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)