X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Friece.el;h=a2d745b0436c7a233e2b867c0481b6b9d3fe54fc;hb=bff28bb1706098b0901cb7b492810a7e7dd621db;hp=7c91272d19f543c0aa5f9386f2126513ce1e5a99;hpb=db1370bb829f1e2a34d64885d571645733f22026;p=elisp%2Friece.git

diff --git a/lisp/riece.el b/lisp/riece.el
index 7c91272..a2d745b 100644
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -254,11 +254,11 @@ If already connected, just pop up the windows."
     (switch-to-buffer (riece-get-buffer-create riece-command-buffer))
     (unless (eq major-mode 'riece-command-mode)
       (riece-command-mode))
-    (let ((server-name
-	   (if (or confirm (null riece-server))
-	       (completing-read "Server: " riece-server-alist)
-	     riece-server)))
-      (riece-open-server (riece-server-name-to-server server-name)))
+    (if (or confirm (null riece-server))
+	(setq riece-server (completing-read "Server: " riece-server-alist)))
+    (if (stringp riece-server)
+	(setq riece-server (riece-server-name-to-server riece-server)))
+    (riece-open-server riece-server)
     (riece-create-buffers)
     (riece-configure-windows)
     (let ((channel-list riece-startup-channel-list))