* riece-filter.el (riece-sentinel): Close process even if

[riece] / lisp / riece.el

diff --git a/lisp/riece.el b/lisp/riece.el
index bfa411f..4885f9d 100644 (file)
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -166,9 +166,7 @@ If optional argument SAFE is nil, overwrite previous definitions."
 
   (riece-define-keys riece-command-mode-map
     "\r" riece-command-enter-message
-    [tab] riece-command-complete
-    [(meta control c) >] riece-command-push
-    [(meta control c) <] riece-command-pop)
+    [(control return)] riece-command-enter-message-as-notice)
 
   (riece-define-keys (riece-command-map "\C-c" riece-command-mode-map)
     "\177" riece-command-scroll-down
@@ -185,7 +183,7 @@ If optional argument SAFE is nil, overwrite previous definitions."
     "o" riece-command-set-operators
     "\C-p" riece-command-part
     "r" riece-command-configure-windows
-    "v" riece-command-set-voices)
+    "v" riece-command-set-speakers)
   (set-keymap-parent riece-command-map riece-dialogue-mode-map)
 
   (riece-define-keys riece-user-list-mode-map
@@ -256,11 +254,12 @@ 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))
-    (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)))
-    (setq riece-server-process (riece-start-server riece-server))
+    (let ((server-name
+          (if (or confirm (null riece-server))
+              (completing-read "Server: " riece-server-alist)
+            riece-server)))
+      (setq riece-server-process (riece-start-server
+                                 (riece-server-name-to-server server-name))))
     (riece-create-buffers)
     (riece-configure-windows)
     (let ((channel-list riece-startup-channel-list))