* elmo-imap4.el (elmo-imap4-get-connection): Abolish local variable `result'.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index e0b32c6..662d749 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -15,6 +15,7 @@
        (elmo-imap4-parse-namespace): Ditto.    
        (elmo-imap4-open-connection): Rewrite.
        (elmo-imap4-open-connection-1): Simplified (authenticate only).
+       (elmo-imap4-get-connection): Abolish local variable `result'.
 
 2000-08-21  Kaoru Takahashi  <kaoru@kaisei.org>
 

diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index a042d84..b56c3a3 100644 (file)
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -420,16 +420,15 @@ BUFFER must be a single-byte buffer."
         (port   (elmo-imap4-spec-port spec))
         (auth   (elmo-imap4-spec-auth spec))
         (type   (elmo-imap4-spec-stream-type spec))
-        entry connection result process
+        entry connection process
         user-at-host-on-port)
     (if (not (elmo-plugged-p host port))
        (error "Unplugged"))
-    (setq user-at-host-on-port (format "%s@%s:%d" user host port))
-    (if type
-       (setq user-at-host-on-port
-             (concat
-              user-at-host-on-port
-              (elmo-network-stream-type-spec-string type))))
+    (setq user-at-host-on-port
+         (format "%s@%s:%d%s" user host port
+                 (if type
+                     (elmo-network-stream-type-spec-string type)
+                   "")))
     (setq entry (assoc user-at-host-on-port elmo-imap4-connection-cache))
     (if (and entry
             (memq (process-status (cadr (cdr entry)))