* 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.

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 053984fcaeb94a1bb73c48ecbd43a78a1d80d5f8..261635d51e227168757946bfa9f3c9bd8fa51b74 100644 (file)
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,15 @@
+2004-11-02  Masatake YAMATO  <jet@gyve.org>
+
+       * 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  <jpw@gnu.org>
 
        * url-gw.el (url-gateway-nslookup-host):

diff --git a/lisp/url/url-imap.el b/lisp/url/url-imap.el
index 79b53e5d01260ca7c90fcaefea17c76c997f8145..7b8f9deb19d59c8ecbcf94a27cf0b6acdf36bf77 100644 (file)
--- 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 8b54b6d92220266e75db3a2c113ce7e8a4abadb2..31254dee4515d2752a839e28846b6d426a5c2b55 100644 (file)
--- 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 432c81f5d4480a45325ced782cada4cd508d7224..9d7f64bb4a4af2cce3b7948c15a7c70ae731f89f 100644 (file)
--- 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 3b834bba75f6fd3e71e71b98bde4b60ee0930c58..ff36c1bdae9bb476a356136d0496b7e5caa2e8ac 100644 (file)
--- 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)))