(pop3-authentication-scheme-alist): New variable.

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

diff --git a/lisp/pop3.el b/lisp/pop3.el
index e6ae5f1..7756da3 100644 (file)
--- a/lisp/pop3.el
+++ b/lisp/pop3.el
@@ -1,10 +1,10 @@
 ;;; pop3.el --- Post Office Protocol (RFC 1460) interface
 
-;; Copyright (C) 1996,1997 Free Software Foundation, Inc.
+;; Copyright (C) 1996,1997,1998 Free Software Foundation, Inc.
 
 ;; Author: Richard L. Pieri <ratinox@peorth.gweep.net>
 ;; Keywords: mail, pop3
-;; Version: 1.3j
+;; Version: 1.3m+
 
 ;; This file is part of GNU Emacs.
 
@@ -37,9 +37,9 @@
 (require 'mail-utils)
 (provide 'pop3)
 
-(defconst pop3-version "1.3j")
+(defconst pop3-version "1.3m+")
 
-(defvar pop3-maildrop (or user-login-name (getenv "LOGNAME") (getenv "USER") nil)
+(defvar pop3-maildrop (or (user-login-name) (getenv "LOGNAME") (getenv "USER") nil)
   "*POP3 maildrop.")
 (defvar pop3-mailhost (or (getenv "MAILHOST") nil)
   "*POP3 mailhost.")
@@ -56,6 +56,9 @@
 Defaults to 'pass, for the standard USER/PASS authentication.  Other valid
 values are 'apop.")
 
+(defvar pop3-authentication-scheme-alist nil
+  "*Alist of host and POP3 authentication scheme.")
+
 (defvar pop3-timestamp nil
   "Timestamp returned when initially connected to the POP server.
 Used for APOP authentication.")
@@ -74,6 +77,7 @@ Used for APOP authentication.")
         (n 1)
         message-count
         (pop3-password pop3-password)
+        (pop3-authentication-scheme pop3-authentication-scheme)
         )
     ;; for debugging only
     (if pop3-debug (switch-to-buffer (process-buffer process)))
@@ -81,6 +85,10 @@ Used for APOP authentication.")
     (if (and pop3-password-required (not pop3-password))
        (setq pop3-password
              (pop3-read-passwd (format "Password for %s: " pop3-maildrop))))
+    (let ((tmp-scheme (cdr (assoc pop3-mailhost
+                                 pop3-authentication-scheme-alist))))
+      (when tmp-scheme
+       (setq pop3-authentication-scheme tmp-scheme)))
     (cond ((equal 'apop pop3-authentication-scheme)
           (pop3-apop process pop3-maildrop))
          ((equal 'pass pop3-authentication-scheme)
@@ -116,7 +124,9 @@ Returns the process associated with the connection."
   (let ((process-buffer
         (get-buffer-create (format "trace of POP session to %s" mailhost)))
        (process)
-       (coding-system-for-read 'binary))
+       (coding-system-for-read 'binary)   ;; because 0000n0000 S000l 0a0
+       (coding-system-for-write 'binary)  ;; is st00pid
+       )
     (save-excursion
       (set-buffer process-buffer)
       (erase-buffer)
@@ -192,10 +202,12 @@ Return the response string if optional second argument is non-nil."
 (defvar pop3-read-passwd nil)
 (defun pop3-read-passwd (prompt)
   (if (not pop3-read-passwd)
-      (if (load "passwd" t)
+      (if (functionp 'read-passwd)
          (setq pop3-read-passwd 'read-passwd)
-       (autoload 'ange-ftp-read-passwd "ange-ftp")
-       (setq pop3-read-passwd 'ange-ftp-read-passwd)))
+       (if (load "passwd" t)
+           (setq pop3-read-passwd 'read-passwd)
+         (autoload 'ange-ftp-read-passwd "ange-ftp")
+         (setq pop3-read-passwd 'ange-ftp-read-passwd))))
   (funcall pop3-read-passwd prompt))
 
 (defun pop3-clean-region (start end)
@@ -299,15 +311,18 @@ This function currently does nothing.")
       (set-buffer (process-buffer process))
       (while (not (re-search-forward "^\\.\r\n" nil t))
        (accept-process-output process 3)
-;      ;; bill@att.com ... to save wear and tear on the heap
-;      (if (> (buffer-size)  20000) (sleep-for 1))
-;      (if (> (buffer-size)  50000) (sleep-for 1))
-;      (if (> (buffer-size) 100000) (sleep-for 1))
-;      (if (> (buffer-size) 200000) (sleep-for 1))
-;      (if (> (buffer-size) 500000) (sleep-for 1))
-;      ;; bill@att.com
+       ;; bill@att.com ... to save wear and tear on the heap
+       ;; uncommented because the condensed version below is a problem for
+       ;; some.
+       (if (> (buffer-size)  20000) (sleep-for 1))
+       (if (> (buffer-size)  50000) (sleep-for 1))
+       (if (> (buffer-size) 100000) (sleep-for 1))
+       (if (> (buffer-size) 200000) (sleep-for 1))
+       (if (> (buffer-size) 500000) (sleep-for 1))
+       ;; bill@att.com
        ;; condensed into:
-       (if (> (buffer-size) 20000) (sleep-for (/ (buffer-size) 20000)))
+       ;; (sometimes causes problems for really large messages.)
+;      (if (> (buffer-size) 20000) (sleep-for (/ (buffer-size) 20000)))
        (goto-char start))
       (setq pop3-read-point (point-marker))
 ;; this code does not seem to work for some POP servers...