If the user doesn't have a /etc/services, supply some sensible port defaults.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8c8cf80..6dd5060 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-09-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * nnimap.el (nnimap-open-connection): If the user doesn't have a
+       /etc/services, supply some sensible port defaults.
+
        * dgnushack.el: Define netrc-credentials.
 
 2010-09-17  Julien Danjou  <julien@danjou.info>  (tiny fix)

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index c744796..c53b9db 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -32,6 +32,8 @@
 (eval-when-compile
   (require 'cl))
 
+(require 'netrc)
+
 (nnoo-declare nnimap)
 
 (defvoo nnimap-address nil
@@ -209,7 +211,10 @@ not done by default on servers that doesn't support that command.")
            (cond
             ((eq nnimap-stream 'network)
              (open-network-stream "*nnimap*" (current-buffer) nnimap-address
-                                  (or nnimap-server-port "imap"))
+                                  (or nnimap-server-port
+                                      (if (netrc-find-service-number "imap")
+                                          "imap"
+                                        "143")))
              (netrc-credentials nnimap-address "imap"))
             ((eq nnimap-stream 'stream)
              (nnimap-open-shell-stream
@@ -218,7 +223,10 @@ not done by default on servers that doesn't support that command.")
              (netrc-credentials nnimap-address "imap"))
             ((eq nnimap-stream 'ssl)
              (open-tls-stream "*nnimap*" (current-buffer) nnimap-address
-                              (or nnimap-server-port "imaps"))
+                              (or nnimap-server-port
+                                  (if (netrc-find-service-number "imaps")
+                                      "imaps"
+                                    "993")))
              (netrc-credentials nnimap-address "imaps" "imap")))))
       (setf (nnimap-process nnimap-object)
            (get-buffer-process (current-buffer)))