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

(riece-handle-311-message): Ditto.
(riece-handle-312-message): Ditto.
(riece-handle-317-message): Ditto.
(riece-handle-319-message): Ditto.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fdbb7ff..f2dc545 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,11 @@
 
        * riece-300.el (riece-handle-317-message): Format idle seconds in
        human readable form.
+       (riece-handle-301-message): Don't use riece-user-regexp.
+       (riece-handle-311-message): Ditto.
+       (riece-handle-312-message): Ditto.
+       (riece-handle-317-message): Ditto.
+       (riece-handle-319-message): Ditto.
 
        * riece-ctcp.el (riece-handle-ctcp-action-request): Prepend target.
        (riece-command-ctcp-action): Ditto.

diff --git a/lisp/riece-300.el b/lisp/riece-300.el
index d82f698..8cd85af 100644 (file)
--- a/lisp/riece-300.el
+++ b/lisp/riece-300.el
@@ -93,7 +93,7 @@
     "\n")))
 
 (defun riece-handle-301-message (prefix number name string)
-  (if (string-match (concat "^\\(" riece-user-regexp "\\) :?") string)
+  (if (string-match (concat "^\\([^ ]+\\) :?") string)
       (let ((user (match-string 1 string))
            (message (substring string (match-end 0))))
        (riece-user-toggle-away user t)
@@ -127,8 +127,7 @@
 
 (defun riece-handle-311-message (prefix number name string)
   (if (string-match
-       (concat "^\\(" riece-user-regexp
-              "\\) \\([^ ]+\\) \\([^ ]+\\) \\* :?")
+       (concat "^\\([^ ]+\\) \\([^ ]+\\) \\([^ ]+\\) \\* :?")
        string)
       (let ((user (match-string 1 string))
            (name (substring string (match-end 0)))
@@ -148,7 +147,7 @@
 
 (defun riece-handle-312-message (prefix number name string)
   (if (string-match
-       (concat "^\\(" riece-user-regexp "\\) \\([^ ]+\\) :?")
+       (concat "^\\([^ ]+\\) \\([^ ]+\\) :?")
        string)
       (riece-insert-info
        (list riece-dialogue-buffer riece-others-buffer)
@@ -174,7 +173,7 @@
 
 (defun riece-handle-317-message (prefix number name string)
   (if (string-match
-       (concat "^\\(" riece-user-regexp "\\) \\([0-9]+\\) ")
+       (concat "^\\([^ ]+\\) \\([0-9]+\\) ")
        string)
       (let* ((user (match-string 1 string))
             (seconds (string-to-number (match-string 2 string)))
@@ -202,7 +201,7 @@
          "\n")))))
 
 (defun riece-handle-319-message (prefix number name string)
-  (if (string-match (concat "^\\(" riece-user-regexp "\\) :?") string)
+  (if (string-match (concat "^\\([^ ]+\\) :?") string)
       (let ((user (match-string 1 string))
            (channels
             (mapconcat