Add no-server option to riece-identity-assoc.

[riece] / lisp / riece-300.el

diff --git a/lisp/riece-300.el b/lisp/riece-300.el
index dd33c6d..0f3d717 100644 (file)
--- a/lisp/riece-300.el
+++ b/lisp/riece-300.el
@@ -235,7 +235,7 @@
   (make-local-variable 'riece-353-message-alist)      
   (if (string-match "^[=\*@] *\\([^ ]+\\) +:?" string)
       (let* ((channel (match-string 1 string))
-            (entry (assoc channel riece-353-message-alist)))
+            (entry (riece-identity-assoc channel riece-353-message-alist t)))
        (if entry
            (setcdr entry
                    (concat (cdr entry)
@@ -414,12 +414,13 @@
             (channel-identity (riece-make-identity channel
                                                    riece-server-name))
             (buffer (riece-channel-buffer channel-identity))
-            (entry (assoc channel riece-353-message-alist))
+            (entry (riece-identity-assoc channel riece-353-message-alist t))
             (string (cdr entry))
             (start 0)
             users)
        (if entry
-           (setcdr entry nil))
+           (setq riece-353-message-alist
+                 (delq entry riece-353-message-alist)))
        (while (string-match
                (concat "\\([@+]\\)?\\(" riece-user-regexp "\\) *")
                string start)