* riece-300.el (riece-353-string): Renamed from riece-353-users.

[riece] / lisp / riece-identity.el

diff --git a/lisp/riece-identity.el b/lisp/riece-identity.el
index fea3ef4..d86c09c 100644 (file)
--- a/lisp/riece-identity.el
+++ b/lisp/riece-identity.el
@@ -138,11 +138,13 @@ will be added."
                   (riece-identity-server identity)))))
     (if riece-abbrev-identity-string-function
        (setq string (funcall riece-abbrev-identity-string-function string)))
-    (put-text-property 0 (length string) 'riece-identity identity string)
+    (riece-put-text-property-nonsticky 0 (length string)
+                                      'riece-identity identity
+                                      string)
     (if prefix-only
-       (put-text-property 0 (length string)
-                          'riece-format-identity-prefix-only t
-                          string))
+       (riece-put-text-property-nonsticky 0 (length string)
+                                          'riece-format-identity-prefix-only t
+                                          string))
     string))
 
 (defun riece-parse-identity (string)
@@ -160,7 +162,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 +172,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))