From 6de11a3e92a1b5ef7067ea846958b3a3ad4e297d Mon Sep 17 00:00:00 2001
From: ueno <ueno>
Date: Fri, 4 Feb 2005 02:28:05 +0000
Subject: [PATCH] * riece-commands.el (riece-command-join): Abolished
 prefix-arg (channel key).

---
 lisp/ChangeLog         |    3 +++
 lisp/riece-commands.el |   35 ++++++++++++++---------------------
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bc62525..d42b68c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2005-02-04  Daiki Ueno  <ueno@unixuser.org>
 
+	* riece-commands.el (riece-command-join): Abolished prefix-arg
+	(channel key).
+
 	* riece-options.el (riece-buffer-dispose-function): Changed the
 	default value from bury-buffer to kill-buffer.
 	* riece-log.el (riece-log-lock-directory): New user option.
diff --git a/lisp/riece-commands.el b/lisp/riece-commands.el
index 3a80f99..2175264 100644
--- a/lisp/riece-commands.el
+++ b/lisp/riece-commands.el
@@ -435,32 +435,25 @@ the layout to the selected layout-name."
       (riece-join-channel target)
       (riece-switch-to-channel target))))
 
-(defun riece-command-join (target &optional key)
+(defun riece-command-join (target)
   (interactive
-   (let* ((completion-ignore-case t)
-	  (target
-	   (if riece-join-channel-candidate
-	       (let ((default (riece-format-identity
-			       riece-join-channel-candidate)))
-		 (riece-completing-read-identity
-		  (format "Join channel/user (default %s): " default)
-		  (riece-get-identities-on-server (riece-current-server-name))
-		  nil nil nil nil default))
-	     (riece-completing-read-identity
-	      "Join channel/user: "
-	      (riece-get-identities-on-server (riece-current-server-name)))))
-	  key)
-     (if (and current-prefix-arg
-	      (riece-channel-p (riece-identity-prefix target)))
-	 (setq key
-	       (riece-read-passwd (format "Key for %s: "
-					  (riece-format-identity target)))))
-     (list target key)))
+   (let ((completion-ignore-case t))
+     (list
+      (if riece-join-channel-candidate
+	  (let ((default (riece-format-identity
+			  riece-join-channel-candidate)))
+	    (riece-completing-read-identity
+	     (format "Join channel/user (default %s): " default)
+	     (riece-get-identities-on-server (riece-current-server-name))
+	     nil nil nil nil default))
+	(riece-completing-read-identity
+	 "Join channel/user: "
+	 (riece-get-identities-on-server (riece-current-server-name)))))))
   (let ((pointer (riece-identity-member target riece-current-channels)))
     (if pointer
 	(riece-command-switch-to-channel (car pointer))
       (if (riece-channel-p (riece-identity-prefix target))
-	  (riece-command-join-channel target key)
+	  (riece-command-join-channel target nil)
 	(riece-command-join-partner target)))))
 
 (defun riece-command-part-channel (target message)
-- 
1.7.10.4