X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-300.el;h=8cd85af360cd22ffe6b799445838d3a90bf233b6;hp=52f7eba4c933c075a9e39a76be3682ecd7d31a4a;hb=3e1734586983bcdaf6be83736d1ca134daa0933f;hpb=78ac843e1969cc20beb6ad959d207e5ec7cea499

diff --git a/lisp/riece-300.el b/lisp/riece-300.el
index 52f7eba..8cd85af 100644
--- 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)))
@@ -198,11 +197,11 @@
 					   (format "%d %s"
 						   (car unit) (cdr unit))))
 				     units))
-			      ", ")))
+			      " ")))
 	  "\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