* riece-300.el (riece-handle-366-message): Don't use riece-user-regexp.

(riece-handle-302-message): Ditto.
(riece-handle-313-message): Ditto.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4730246..c0b329f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,8 @@
 2005-04-04  Daiki Ueno  <ueno@unixuser.org>
 
        * riece-300.el (riece-handle-366-message): Don't use riece-user-regexp.
+       (riece-handle-302-message): Ditto.
+       (riece-handle-313-message): Ditto.
 
 2005-03-22  Daiki Ueno  <ueno@unixuser.org>
 

diff --git a/lisp/riece-300.el b/lisp/riece-300.el
index 70032e8..2f758dc 100644 (file)
--- a/lisp/riece-300.el
+++ b/lisp/riece-300.el
@@ -40,8 +40,7 @@
                               " ")))
     (while replies
       (if (string-match
-          (concat "^\\(" riece-user-regexp
-                  "\\)\\(\\*\\)?=\\([-+]\\)\\([^ ]+\\)")
+          (concat "^\\([^ ]+\\)\\(\\*\\)?=\\([-+]\\)\\([^ ]+\\)")
           (car replies))
          (let ((user (match-string 1 (car replies)))
                (operator (not (null (match-beginning 2))))
@@ -159,7 +158,7 @@
        "\n"))))
 
 (defun riece-handle-313-message (prefix number name string)
-  (if (string-match (concat "^" riece-user-regexp) string)
+  (if (string-match "^[^ ]+" string)
       (let ((user (match-string 0 string)))
        (riece-insert-info
         (list riece-dialogue-buffer riece-others-buffer)