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)
(eval-when-compile
(require 'cl))
+(require 'netrc)
+
(nnoo-declare nnimap)
(defvoo nnimap-address nil
(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
(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)))