X-Git-Url: http://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-ctcp.el;h=9406b12d50a9acbe062096ef4dd74b5bc1451196;hp=240c9ac8e17f7c08b6dd8aa92d36f9d16e1b90ab;hb=1622a7f5532394d43982e1629393aec8098e45b8;hpb=fd2f4576f383044390c4523947aaead409d34c1a

diff --git a/lisp/riece-ctcp.el b/lisp/riece-ctcp.el
index 240c9ac..9406b12 100644
--- a/lisp/riece-ctcp.el
+++ b/lisp/riece-ctcp.el
@@ -251,37 +251,36 @@
 	     string))
     "\n")))
 
+(defun riece-ctcp-completing-read-identity ()
+  (riece-completing-read-identity
+   "Channel/User: "
+   (let ((server-name (riece-current-server-name)))
+     (append (mapcar
+	      (lambda (user)
+		(riece-make-identity user server-name))
+	      (riece-get-users-on-server))
+	     riece-current-channels))))
+
 (defun riece-command-ctcp-version (user)
   (interactive
-   (let ((completion-ignore-case t))
-     (list (completing-read
-	    "Channel/User: "
-	    (mapcar #'list (riece-get-users-on-server))))))
+   (list (riece-ctcp-completing-read-identity)))
   (riece-send-string (format "PRIVMSG %s :\1VERSION\1\r\n" user)))
 
 (defun riece-command-ctcp-ping (user)
   (interactive
-   (let ((completion-ignore-case t))
-     (list (completing-read
-	    "Channel/User: "
-	    (mapcar #'list (riece-get-users-on-server))))))
+   (list (riece-ctcp-completing-read-identity)))
   (riece-send-string (format "PRIVMSG %s :\1PING\1\r\n" user))
   (setq riece-ctcp-ping-time (current-time)))
 
 (defun riece-command-ctcp-clientinfo (user)
   (interactive
-   (let ((completion-ignore-case t))
-     (list (completing-read
-	    "Channel/User: "
-	    (mapcar #'list (riece-get-users-on-server))))))
+   (list (riece-ctcp-completing-read-identity)))
   (riece-send-string (format "PRIVMSG %s :\1CLIENTINFO\1\r\n" user)))
 
 (defun riece-command-ctcp-action (channel action)
   (interactive
    (list (if current-prefix-arg
-	     (completing-read
-	      "Channel/User: "
-	      (mapcar #'list riece-current-channels))
+	     (riece-ctcp-completing-read-identity)
 	   riece-current-channel)
 	 (read-string "Action: ")))
   (if (equal action "")
@@ -289,8 +288,7 @@
   (riece-send-string (format "PRIVMSG %s :\1ACTION %s\1\r\n"
 			     (riece-identity-prefix channel)
 			     action))
-  (let ((buffer (riece-channel-buffer (riece-make-identity
-				       channel riece-server-name))))
+  (let ((buffer (riece-channel-buffer channel)))
     (riece-insert-change
      buffer
      (concat (riece-identity-prefix (riece-current-nickname)) " " action "\n"))