Synch to Gnus 200308070200.

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

diff --git a/lisp/nnwarchive.el b/lisp/nnwarchive.el
index e7134fd..57f31e9 100644 (file)
--- a/lisp/nnwarchive.el
+++ b/lisp/nnwarchive.el
@@ -1,5 +1,5 @@
 ;;; nnwarchive.el --- interfacing with web archives
-;; Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: news egroups mail-archive
@@ -41,7 +41,6 @@
 (require 'gnus-bcklg)
 (require 'nnmail)
 (require 'mm-util)
-(require 'mail-source)
 (require 'mm-url)
 
 (nnoo-declare nnwarchive)
@@ -94,7 +93,7 @@
   "Where nnwarchive will save its files.")
 
 (defvoo nnwarchive-type nil
-    "The type of nnwarchive.")
+  "The type of nnwarchive.")
 
 (defvoo nnwarchive-address ""
   "The address of nnwarchive.")
@@ -223,9 +222,9 @@
       (set-buffer nntp-server-buffer)
       (erase-buffer)
       (let (header)
-      (dolist (art articles)
-       (if (setq header (assq art nnwarchive-headers))
-           (nnheader-insert-nov (cdr header))))))
+       (dolist (art articles)
+         (if (setq header (assq art nnwarchive-headers))
+             (nnheader-insert-nov (cdr header))))))
     (let ((elem (assoc group nnwarchive-headers-cache)))
       (if elem
          (setcdr elem nnwarchive-headers)
@@ -282,11 +281,11 @@
     (setq nnwarchive-login
          (or nnwarchive-login
              (read-string
-                (format "Login at %s: " server)
-                user-mail-address)))
+              (format "Login at %s: " server)
+              user-mail-address)))
     (setq nnwarchive-passwd
          (or nnwarchive-passwd
-             (mail-source-read-passwd
+             (read-passwd
               (format "Password for %s at %s: "
                       nnwarchive-login server)))))
   (unless nnwarchive-groups
@@ -589,7 +588,7 @@
   (let (p refs url mime e
          from subject date id
          done
-         (case-fold-serch t))
+         (case-fold-search t))
     (save-restriction
       (goto-char (point-min))
       (when (search-forward "X-Head-End" nil t)