Undo.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 79bea4a..0472c48 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -28,8 +28,6 @@
        (riece-close-server-process): Delete process even if process is
        not running.
 
-       * riece.el (riece): Don't set riece-server.
-
 2003-05-31  Daiki Ueno  <ueno@unixuser.org>
 
        * riece-server.el (riece-open-server): No need to reset

diff --git a/lisp/riece.el b/lisp/riece.el
index 7c91272..a2d745b 100644 (file)
--- 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))