* riece-commands.el (riece-command-universal-server-name-argument):

[riece] / lisp / riece-identity.el

diff --git a/lisp/riece-identity.el b/lisp/riece-identity.el
index 6b6eedf..098f50f 100644 (file)
--- a/lisp/riece-identity.el
+++ b/lisp/riece-identity.el
@@ -128,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
@@ -142,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
@@ -151,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 "\\|"