From: ueno <ueno>
Date: Sat, 29 May 2004 07:26:55 +0000 (+0000)
Subject: * riece-commands.el (riece-command-finger): Complete user names
X-Git-Tag: riece-1_0_0~2
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=e1c018ea261e1e1520bfea993f6f24884826545e;p=elisp%2Friece.git

* riece-commands.el (riece-command-finger): Complete user names
without server-name.
(riece-command-invite): Ditto.
(riece-command-change-mode): Ditto.
(riece-command-enter-message-to-user): Ditto.

* riece-identity.el (riece-completing-read-identity): Add extra
8th arg "no-server".
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b082537..4e88e4c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,16 @@
 2004-05-29  Daiki Ueno  <ueno@unixuser.org>
 
+	* riece-commands.el (riece-command-finger): Complete user names
+	without server-name.
+	(riece-command-invite): Ditto.
+	(riece-command-change-mode): Ditto.
+	(riece-command-enter-message-to-user): Ditto.
+
+	* riece-identity.el (riece-completing-read-identity): Add extra
+	8th arg "no-server".
+
+2004-05-29  Daiki Ueno  <ueno@unixuser.org>
+
 	* riece-server.el: Move autoload setting for 'riece-exit before
 	riece-open-server.
 
diff --git a/lisp/riece-commands.el b/lisp/riece-commands.el
index 76b0e30..b142119 100644
--- a/lisp/riece-commands.el
+++ b/lisp/riece-commands.el
@@ -148,7 +148,8 @@ the layout to the selected layout-name."
    (let* ((completion-ignore-case t)
 	  (user (riece-completing-read-identity
 		 "Finger user: "
-		 (riece-get-users-on-server (riece-current-server-name)))))
+		 (riece-get-users-on-server (riece-current-server-name))
+		 nil nil nil nil nil t)))
      (list user current-prefix-arg)))
   (if recurse
       (riece-send-string (format "WHOIS %s %s\r\n"
@@ -179,7 +180,8 @@ the layout to the selected layout-name."
      (riece-check-channel-commands-are-usable t)
      (list (riece-completing-read-identity
 	    "Invite user: "
-	    (riece-get-users-on-server (riece-current-server-name))))))
+	    (riece-get-users-on-server (riece-current-server-name))
+	    nil nil nil nil nil t))))
   (riece-send-string (format "INVITE %s %s\r\n"
 			     (riece-identity-prefix user)
 			     (riece-identity-prefix riece-current-channel))))
@@ -254,7 +256,8 @@ the layout to the selected layout-name."
 	   (if current-prefix-arg
 	       (riece-completing-read-identity
 		"Change mode for channel/user: "
-		(riece-get-identities-on-server (riece-current-server-name)))
+		(riece-get-identities-on-server (riece-current-server-name))
+		nil nil nil nil nil t)
 	     (riece-check-channel-commands-are-usable t)
 	     riece-current-channel))
 	  (riece-overriding-server-name (riece-identity-server channel))
@@ -393,7 +396,8 @@ the layout to the selected layout-name."
    (let ((completion-ignore-case t))
      (list (riece-completing-read-identity
 	    "Message to user: "
-	    (riece-get-users-on-server (riece-current-server-name))))))
+	    (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))))
diff --git a/lisp/riece-identity.el b/lisp/riece-identity.el
index fea3ef4..e025c60 100644
--- a/lisp/riece-identity.el
+++ b/lisp/riece-identity.el
@@ -160,7 +160,8 @@ The string will be expanded by
 
 (defun riece-completing-read-identity (prompt channels
 					      &optional predicate require-match
-					      initial history default)
+					      initial history default
+					      no-server)
   "Read an identity object in the minibuffer, with completion.
 PROMPT is a string to prompt with; normally it ends in a colon and a space.
 CHANNELS is a list of identity objects.
@@ -169,7 +170,7 @@ The rest of arguments are the same as `completing-read'."
 	  (completing-read
 	   prompt
 	   (mapcar (lambda (channel)
-		     (list (riece-format-identity channel)))
+		     (list (riece-format-identity channel no-server)))
 		   (delq nil (copy-sequence (or channels
 						riece-current-channels))))
 	   predicate require-match initial history default))