* elmo-internal.el (elmo-internal-search): Rewrite.

[elisp/wanderlust.git] / elmo / elmo-pop3.el

diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el
index 70e9e66..dcdc32f 100644 (file)
--- a/elmo/elmo-pop3.el
+++ b/elmo/elmo-pop3.el
@@ -1,8 +1,10 @@
 ;;; elmo-pop3.el -- POP3 Interface for ELMO.
 
-;; Copyright 1998,1999,2000 Yuuichi Teranishi <teranisi@gohome.org>
+;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi <teranisi@gohome.org>
+;; Copyright (C) 1999,2000      Kenichi OKADA <okada@opaopa.org>
 
 ;; Author: Yuuichi Teranishi <teranisi@gohome.org>
+;;     Kenichi OKADA <okada@opaopa.org>
 ;; Keywords: mail, net news
 
 ;; This file is part of ELMO (Elisp Library for Message Orchestration).
@@ -303,7 +305,7 @@
 (luna-define-method elmo-network-initialize-session ((session
                                                      elmo-pop3-session))
   (let ((process (elmo-network-session-process-internal session))
-       response capability mechanism)
+       response mechanism)
     (with-current-buffer (process-buffer process)
       (set-process-filter process 'elmo-pop3-process-filter)
       (setq elmo-pop3-read-point (point-min))
@@ -320,7 +322,7 @@
                          (elmo-pop3-read-response process))
            (starttls-negotiate process)
          (signal 'elmo-open-error
-                 '(elmo-network-intialize-session)))))))
+                 '(elmo-pop3-starttls-error)))))))
 
 (luna-define-method elmo-network-authenticate-session ((session
                                                        elmo-pop3-session))
@@ -358,10 +360,10 @@
        ;; UIDL
        (elmo-pop3-send-command process "uidl")
        (unless (elmo-pop3-read-response process)
-         (error "UIDL failed."))
+         (error "UIDL failed"))
        (unless (setq response (elmo-pop3-read-contents
                                (current-buffer) process))
-         (error "UIDL failed."))
+         (error "UIDL failed"))
        (elmo-pop3-parse-uidl-response response)))))
 
 (defun elmo-pop3-read-contents (buffer process)
@@ -530,7 +532,7 @@
        (elmo-pop3-send-command process (format
                                         "top %s 0" (car articles))
                                'no-erase)
-       ;; (accept-process-output process 1)
+;;;    (accept-process-output process 1)
        (setq articles (cdr articles))
        (setq count (1+ count))
        ;; Every 200 requests we have to read the stream in
@@ -555,7 +557,7 @@
                   'elmo-pop3-retrieve-headers "Getting headers..."
                   (/ (* received 100) number))))
            (accept-process-output process 1)
-           ;(accept-process-output process)
+;;;        (accept-process-output process)
            (discard-input))))
       ;; Remove all "\r"'s.
       (goto-char (point-min))