X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Friece-commands.el;h=3d0f9a9e1d0737cce40e3592684749834480defc;hb=40d9a9643c84389185388dd7d2526cf261b12eff;hp=a4c0cf2223541c6c82f633425a9ddb0452f1995d;hpb=e7568cae27a5d991c2818161169fa6ab85b2f388;p=elisp%2Friece.git

diff --git a/lisp/riece-commands.el b/lisp/riece-commands.el
index a4c0cf2..3d0f9a9 100644
--- a/lisp/riece-commands.el
+++ b/lisp/riece-commands.el
@@ -117,7 +117,8 @@
   "Select a layout-name from all current available layouts and change
 the layout to the selected layout-name."
   (interactive (list (completing-read "Layout: " riece-layout-alist)))
-  (customize-set-variable 'riece-layout name))
+  (setq riece-layout name)
+  (riece-command-configure-windows))
 
 (defun riece-command-toggle-channel-buffer-mode ()
   (interactive)
@@ -424,9 +425,10 @@ the layout to the selected layout-name."
 	    "Channel/User: " riece-current-channels))
 	  key)
      (if (and current-prefix-arg
-	      (riece-channel-p target))
+	      (riece-channel-p (riece-identity-prefix target)))
 	 (setq key
-	       (riece-read-passwd (format "Key for %s: " target))))
+	       (riece-read-passwd (format "Key for %s: "
+					  (riece-format-identity target)))))
      (list target key)))
   (let ((pointer (riece-identity-member target riece-current-channels)))
     (if pointer
@@ -453,8 +455,10 @@ the layout to the selected layout-name."
    (let* ((completion-ignore-case t)
 	 (target
 	  (riece-completing-read-identity
-	   "Channel/User: " riece-current-channels nil nil
-	   (cons (riece-format-identity riece-current-channel) 0)))
+	   (format "Channel/User (default %s): "
+		   (riece-format-identity riece-current-channel))
+	   riece-current-channels nil nil nil nil
+	   (riece-format-identity riece-current-channel)))
 	 message)
      (if (and current-prefix-arg
 	      (riece-channel-p (riece-identity-prefix target)))