X-Git-Url: http://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-commands.el;h=c5c463b52eceaf27fb49bc3a1d2ee49a2943539a;hp=caaff596a817a5139c58623ae842a4d3dfb54641;hb=7f49617682aff4897389a9a83f8b640033b65321;hpb=6bb778ad5b475dc9e19756a05403d7505d9f469c

diff --git a/lisp/riece-commands.el b/lisp/riece-commands.el
index caaff59..c5c463b 100644
--- a/lisp/riece-commands.el
+++ b/lisp/riece-commands.el
@@ -154,6 +154,7 @@ the layout to the selected layout-name."
 
 (defun riece-command-topic (topic)
   (interactive
+   (riece-check-channel-commands-are-usable t)
    (list (read-from-minibuffer
 	  "Topic: " (cons (or (riece-with-server-buffer
 				  (riece-identity-server riece-current-channel)
@@ -168,11 +169,8 @@ the layout to the selected layout-name."
 
 (defun riece-command-invite (user)
   (interactive
+   (riece-check-channel-commands-are-usable t)
    (let ((completion-ignore-case t))
-     (unless (and riece-current-channel
-		  (riece-channel-p (riece-identity-prefix
-				    riece-current-channel)))
-       (error "Not on a channel"))
      (list (completing-read
 	    "User: "
 	    (mapcar #'list (riece-get-users-on-server))))))
@@ -182,11 +180,8 @@ the layout to the selected layout-name."
 
 (defun riece-command-kick (user &optional message)
   (interactive
+   (riece-check-channel-commands-are-usable t)
    (let ((completion-ignore-case t))
-     (unless (and riece-current-channel
-		  (riece-channel-p (riece-identity-prefix
-				    riece-current-channel)))
-       (error "Not on a channel"))
      (list (completing-read
 	    "User: "
 	    (mapcar #'list
@@ -254,6 +249,7 @@ the layout to the selected layout-name."
 	   (if current-prefix-arg
 	       (riece-completing-read-identity
 		"Channel/User: " riece-current-channels)
+	     (riece-check-channel-commands-are-usable t)
 	     riece-current-channel))
 	  (riece-overriding-server-name (riece-identity-server channel))
 	  (riece-temp-minibuffer-message
@@ -275,6 +271,7 @@ the layout to the selected layout-name."
 
 (defun riece-command-set-operators (users &optional arg)
   (interactive
+   (riece-check-channel-commands-are-usable t)
    (let ((operators
 	  (riece-with-server-buffer
 	      (riece-identity-server riece-current-channel)
@@ -316,6 +313,7 @@ the layout to the selected layout-name."
 
 (defun riece-command-set-speakers (users &optional arg)
   (interactive
+   (riece-check-channel-commands-are-usable t)
    (let ((speakers
 	  (riece-with-server-buffer
 	      (riece-identity-server riece-current-channel)
@@ -359,9 +357,7 @@ the layout to the selected layout-name."
   "Send MESSAGE to the current channel."
   (if (equal message "")
       (error "No text to send"))
-  (unless riece-current-channel
-    (error (substitute-command-keys
-	    "Type \\[riece-command-join] to join a channel")))
+  (riece-check-channel-commands-are-usable)
   (if notice
       (progn
 	(riece-send-string
@@ -448,9 +444,6 @@ the layout to the selected layout-name."
 
 (defun riece-command-part-channel (target message)
   (let ((process (riece-server-process (riece-identity-server target))))
-    (unless process
-      (error "%s" (substitute-command-keys
-		   "Type \\[riece-command-open-server] to open server.")))
     (riece-process-send-string process
 			       (if message
 				   (format "PART %s :%s\r\n"
@@ -461,6 +454,7 @@ the layout to the selected layout-name."
 
 (defun riece-command-part (target &optional message)
   (interactive
+   (riece-check-channel-commands-are-usable)
    (let* ((completion-ignore-case t)
 	 (target
 	  (riece-completing-read-identity