* riece-commands.el (riece-command-join): Extract target

[riece] / lisp / riece-commands.el

diff --git a/lisp/riece-commands.el b/lisp/riece-commands.el
index 8303504..d8319f2 100644 (file)
--- a/lisp/riece-commands.el
+++ b/lisp/riece-commands.el
@@ -26,6 +26,7 @@
 
 (require 'riece-channel)
 (require 'riece-complete)
 
 (require 'riece-channel)
 (require 'riece-complete)

+(require 'riece-layout)

 (require 'riece-display)
 (require 'riece-version)
 (require 'riece-server)
 (require 'riece-display)
 (require 'riece-version)
 (require 'riece-server)


@@ -112,6 +113,13 @@
   (interactive)
   (riece-redisplay-buffers t))
 
   (interactive)
   (riece-redisplay-buffers t))
 

+(defun riece-command-change-layout (name)
+  "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)))
+  (setq riece-layout name)
+  (riece-command-configure-windows))
+

 (defun riece-command-toggle-channel-buffer-mode ()
   (interactive)
   (setq riece-channel-buffer-mode
 (defun riece-command-toggle-channel-buffer-mode ()
   (interactive)
   (setq riece-channel-buffer-mode


@@ -417,7 +425,7 @@
            "Channel/User: " riece-current-channels))
          key)
      (if (and current-prefix-arg
            "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))))
      (list target key)))
         (setq key
               (riece-read-passwd (format "Key for %s: " target))))
      (list target key)))