X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Friece-identity.el;h=098f50fe9b50f9f3c7e63320fde774558f4d04d4;hb=b9d6ae0d8aa0c6459bf6cccb8604ce4ff31bf66b;hp=0def749f2763bbc2015886f0373b75a72dac49e8;hpb=005a2a7642c9f43d699922799801124a77d56f5d;p=riece

diff --git a/lisp/riece-identity.el b/lisp/riece-identity.el
index 0def749..098f50f 100644
--- a/lisp/riece-identity.el
+++ b/lisp/riece-identity.el
@@ -26,7 +26,6 @@
 
 (require 'riece-globals)
 (require 'riece-coding)
-(require 'riece-server)
 (require 'riece-compat)			;riece-set-case-syntax-pair
 
 (defvar riece-abbrev-identity-string-function nil)
@@ -129,8 +128,9 @@ RFC2812, 2.2 \"Character codes\" says:
 	   (concat (riece-identity-prefix identity) " "
 		   (riece-identity-server identity)))))
     (if riece-abbrev-identity-string-function
-	(funcall riece-abbrev-identity-string-function string)
-      string)))
+	(setq string (funcall riece-abbrev-identity-string-function string)))
+    (put-text-property 0 (length string) 'riece-identity identity string)
+    string))
 
 (defun riece-parse-identity (string)
   (if riece-expand-identity-string-function
@@ -143,8 +143,8 @@ RFC2812, 2.2 \"Character codes\" says:
 			 "")))
 
 (defun riece-completing-read-identity (prompt channels
-					      &optional predicate must-match
-					      initial)
+					      &optional predicate require-match
+					      initial history default)
   (let* ((string
 	  (completing-read
 	   prompt
@@ -152,7 +152,7 @@ RFC2812, 2.2 \"Character codes\" says:
 		     (list (riece-format-identity channel)))
 		   (delq nil (copy-sequence (or channels
 						riece-current-channels))))
-	   predicate must-match initial))
+	   predicate require-match initial history default))
 	 (identity
 	  (riece-parse-identity string)))
     (unless (string-match (concat "^\\(" riece-channel-regexp "\\|"