X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Friece-commands.el;h=2175264eccd0d3092b478c50c48c5d690e40a475;hb=63a949571bb823c9bf8459d01e37a5fbf38b6af1;hp=22d2755640e3d0dffd76aac70db589e0a7448598;hpb=d2d5efa3884cc8eba9396e7c247ed02fe7295a80;p=riece

diff --git a/lisp/riece-commands.el b/lisp/riece-commands.el
index 22d2755..2175264 100644
--- a/lisp/riece-commands.el
+++ b/lisp/riece-commands.el
@@ -398,11 +398,13 @@ the layout to the selected layout-name."
 (defun riece-command-enter-message-to-user (user)
   "Send the current line to USER."
   (interactive
-   (let ((completion-ignore-case t))
-     (list (riece-completing-read-identity
-	    "Message to user: "
-	    (riece-get-users-on-server (riece-current-server-name))
-	    nil nil nil nil nil t))))
+   (if (and (bolp) (eolp))
+       (error "No text to send")
+     (let ((completion-ignore-case t))
+       (list (riece-completing-read-identity
+	      "Message to user: "
+	      (riece-get-users-on-server (riece-current-server-name))
+	      nil nil nil nil nil t)))))
   (let ((text (buffer-substring
 	       (riece-line-beginning-position)
 	       (riece-line-end-position))))
@@ -433,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)
@@ -668,7 +663,7 @@ If prefix argument ARG is non-nil, toggle frozen status."
 			  (list (riece-format-identity user t)))
 			(riece-get-users-on-server
 			 (riece-current-server-name))))
-	 (current (current-word))
+	 (current (or (current-word) ""))
 	 (completion (try-completion current table))
 	 (all (all-completions current table)))
     (if (eq completion t)
@@ -678,6 +673,7 @@ If prefix argument ARG is non-nil, toggle frozen status."
 	(if (equal current completion)
 	    (with-output-to-temp-buffer "*Help*"
 	      (display-completion-list all))
+	  (re-search-forward "\\>" nil t)
 	  (delete-region (point) (- (point) (length current)))
 	  (insert completion))))))