Synch with Oort Gnus.

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

diff --git a/lisp/pop3.el b/lisp/pop3.el
index 8571f33..78038c3 100644 (file)
--- a/lisp/pop3.el
+++ b/lisp/pop3.el
@@ -35,10 +35,23 @@
 
 ;; This program was inspired by Kyle E. Jones's vm-pop program.
 
+;; You have to set the variable `pop3-connection-type' to `ssl' or
+;; `tls' expressly, if you would like to use this module with Gnus
+;; (not T-gnus) for those connection types.  For examples:
+;;
+;;(setq mail-sources '((pop :server "POPSERVER" :port 995 :connection ssl
+;;                          :authentication apop)))
+;;(setq pop3-connection-type 'ssl)
+
 ;;; Code:
 
 (eval-when-compile (require 'cl))
 
+;; as-binary-process, open-network-stream-as-binary, write-region-as-binary
+(require 'pces)
+;; exec-installed-p
+(require 'path-util)
+
 (require 'mail-utils)
 
 (defvar pop3-maildrop (or (user-login-name) (getenv "LOGNAME") (getenv "USER") nil)
@@ -87,7 +100,6 @@ Nil means no, t means yes, not-nil-or-t means yet to be determined.")
 (defvar pop3-debug nil)
 
 (eval-and-compile
-  (autoload 'open-ssl-stream "ssl")
   (autoload 'starttls-open-stream "starttls")
   (autoload 'starttls-negotiate "starttls"))
 
@@ -211,7 +223,7 @@ Argument PORT specifies connecting port."
       process)))
 
 (defun pop3-open-ssl-stream-1 (name buffer host service extra-arg)
-  (require 'path-util)
+  (require 'ssl)
   (let* ((ssl-program-name
          pop3-ssl-program-name)
         (ssl-program-arguments
@@ -236,16 +248,9 @@ Argument PORT specifies connecting port."
   "Open a SSL connection for a service to a host.
 Returns a subprocess-object to represent the connection.
 Args are NAME BUFFER HOST SERVICE."
-  (cond ((eq system-type 'windows-nt)
-        (let (selective-display
-              (coding-system-for-write 'binary)
-              (coding-system-for-read 'raw-text-dos))
-          (or (pop3-open-ssl-stream-1 name buffer host service "-ssl3")
-              (pop3-open-ssl-stream-1 name buffer host service "-ssl2"))))
-       (t
-        (as-binary-process
-         (or (pop3-open-ssl-stream-1 name buffer host service "-ssl3")
-             (pop3-open-ssl-stream-1 name buffer host service "-ssl2"))))))
+  (as-binary-process
+   (or (pop3-open-ssl-stream-1 name buffer host service "-ssl3")
+       (pop3-open-ssl-stream-1 name buffer host service "-ssl2"))))
 
 (defun pop3-open-tls-stream (name buffer host service)
   "Open a TLSv1 connection for a service to a host.