From 60b5eb7862e363b06cf38921228f658471e5ba4f Mon Sep 17 00:00:00 2001 From: Masatake YAMATO Date: Tue, 2 Nov 2004 09:40:30 +0000 Subject: [PATCH] * url-imap.el (url-imap-open-host): Don't use `string-to-int'. The port returned by `url-port' is expected to be an integer. * url-irc.el (url-irc): Ditto. * url-news.el (url-news-open-host): Ditto. * url-nfs.el (url-nfs-build-filename): Ditto. --- lisp/url/ChangeLog | 12 ++++++++++++ lisp/url/url-imap.el | 2 -- lisp/url/url-irc.el | 2 +- lisp/url/url-news.el | 2 +- lisp/url/url-nfs.el | 2 +- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 053984fcaeb..261635d51e2 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -1,3 +1,15 @@ +2004-11-02 Masatake YAMATO + + * url-imap.el (url-imap-open-host): Don't use + `string-to-int'. The port returned by `url-port' + is expected to be an integer. + + * url-irc.el (url-irc): Ditto. + + * url-news.el (url-news-open-host): Ditto. + + * url-nfs.el (url-nfs-build-filename): Ditto. + 2004-10-20 John Paul Wallington * url-gw.el (url-gateway-nslookup-host): diff --git a/lisp/url/url-imap.el b/lisp/url/url-imap.el index 79b53e5d012..7b8f9deb19d 100644 --- a/lisp/url/url-imap.el +++ b/lisp/url/url-imap.el @@ -47,8 +47,6 @@ (let ((imap-username user) (imap-password pass) (authenticator (if user 'login 'anonymous))) - (if (stringp port) - (setq port (string-to-int port))) (nnimap-open-server host `((nnimap-server-port ,port) (nnimap-stream 'network) diff --git a/lisp/url/url-irc.el b/lisp/url/url-irc.el index 8b54b6d9222..31254dee451 100644 --- a/lisp/url/url-irc.el +++ b/lisp/url/url-irc.el @@ -61,7 +61,7 @@ PASSWORD - What password to use" ;;;###autoload (defun url-irc (url) (let* ((host (url-host url)) - (port (string-to-int (url-port url))) + (port (url-port url)) (pass (url-password url)) (user (url-user url)) (chan (url-filename url))) diff --git a/lisp/url/url-news.el b/lisp/url/url-news.el index 432c81f5d44..9d7f64bb4a4 100644 --- a/lisp/url/url-news.el +++ b/lisp/url/url-news.el @@ -38,7 +38,7 @@ (defun url-news-open-host (host port user pass) (if (fboundp 'nnheader-init-server-buffer) (nnheader-init-server-buffer)) - (nntp-open-server host (list (string-to-int port))) + (nntp-open-server host (list port)) (if (and user pass) (progn (nntp-send-command "^.*\r?\n" "AUTHINFO USER" user) diff --git a/lisp/url/url-nfs.el b/lisp/url/url-nfs.el index 3b834bba75f..ff36c1bdae9 100644 --- a/lisp/url/url-nfs.el +++ b/lisp/url/url-nfs.el @@ -62,7 +62,7 @@ Each can be used any number of times.") (defun url-nfs-build-filename (url) (let* ((host (url-host url)) - (port (string-to-int (url-port url))) + (port (url-port url)) (pass (url-password url)) (user (url-user url)) (file (url-filename url))) -- 2.39.5