Synch to No Gnus 200601190601.

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

diff --git a/lisp/pop3.el b/lisp/pop3.el
index ad79d6b..8a43c47 100644 (file)
--- a/lisp/pop3.el
+++ b/lisp/pop3.el
@@ -313,7 +313,7 @@ SSL/TSL-secured stream) or `starttls' (use the starttls mechanism
 to turn on TLS security after opening the stream).  However, if
 this is nil, `ssl' is assumed for connexions to port
 995 (pop3s)."
-  :version "23.1"                      ; fixme?
+  :version "23.0" ;; No Gnus
   :group 'pop3
   :type '(choice (const :tag "Plain" nil)
                 (const :tag "SSL/TLS" ssl)
@@ -334,11 +334,19 @@ Argument PORT specifies connecting port."
        (cond
        ((or (eq pop3-connection-type 'ssl)
             (eq pop3-stream-type 'ssl)
-            (and (not pop3-stream-type) (= port 995))) ; pop3s
+            (and (not pop3-stream-type) (member port '(995 "pop3s"))))
+        ;; gnutls-cli, openssl don't accept service names
+        (if (or (equal port "pop3s")
+                (null port))
+            (setq port 995))
         (pop3-open-ssl-stream "POP" (current-buffer) mailhost port))
        ((or (memq pop3-connection-type '(tls starttls))
             (memq pop3-stream-type '(tls starttls)))
-        (pop3-open-tls-stream "POP" (current-buffer) mailhost port))
+        ;; gnutls-cli, openssl don't accept service names
+        (if (equal port "pop3")
+            (setq port 110))
+        (pop3-open-tls-stream "POP" (current-buffer)
+                              mailhost (or port 110)))
        (t
         (let ((coding-system-for-read 'binary)
               (coding-system-for-write 'binary))