* riece-300.el (riece-handle-302-message): Don't expect leading

":" before parameter list.
(riece-handle-301-message): Ditto.
(riece-handle-311-message): Ditto.
(riece-handle-312-message): Ditto.
(riece-handle-317-message): Ditto.
(riece-handle-319-message): Ditto.
(riece-handle-351-message): Ditto.
(riece-handle-353-message): Ditto.
(riece-handle-322-message): Ditto.
(riece-handle-set-topic): Ditto.
(riece-handle-366-message): Ditto.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 624bd7d..4f075a1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+2004-11-15  Daiki Ueno  <ueno@unixuser.org>
+
+       * riece-300.el (riece-handle-302-message): Don't expect leading
+       ":" before parameter list.
+       (riece-handle-301-message): Ditto.
+       (riece-handle-311-message): Ditto.
+       (riece-handle-312-message): Ditto.
+       (riece-handle-317-message): Ditto.
+       (riece-handle-319-message): Ditto.
+       (riece-handle-351-message): Ditto.
+       (riece-handle-353-message): Ditto.
+       (riece-handle-322-message): Ditto.
+       (riece-handle-set-topic): Ditto.
+       (riece-handle-366-message): Ditto.
+
 2004-11-14  Daiki Ueno  <ueno@unixuser.org>
 
        * riece.el (riece-exit): Reset riece-channel-status-indicator.

diff --git a/lisp/riece-300.el b/lisp/riece-300.el
index edf75b5..9c528a2 100644 (file)
--- a/lisp/riece-300.el
+++ b/lisp/riece-300.el
@@ -34,7 +34,10 @@
 
 (defun riece-handle-302-message (prefix number name string)
   "RPL_USERHOST \":*1<reply> *( \" \" <reply> )\""
-  (let ((replies (split-string (substring string 1) " ")))
+  (let ((replies (split-string (if (eq (aref string 0) ?:)
+                                  (substring string 1)
+                                string)
+                              " ")))
     (while replies
       (if (string-match
           (concat "^\\(" riece-user-regexp
@@ -82,12 +85,15 @@
                (riece-format-identity
                 (riece-make-identity user riece-server-name)
                 t))
-             (split-string (substring string 1) " ")
+             (split-string (if (eq (aref string 0) ?:)
+                               (substring string 1)
+                             string)
+                           " ")
              "")))
     "\n")))
 
 (defun riece-handle-301-message (prefix number name string)
-  (if (string-match (concat "^\\(" riece-user-regexp "\\) :") string)
+  (if (string-match (concat "^\\(" riece-user-regexp "\\) :?") string)
       (let ((user (match-string 1 string))
            (message (substring string (match-end 0))))
        (riece-user-toggle-away user t)
@@ -122,7 +128,7 @@
 (defun riece-handle-311-message (prefix number name string)
   (if (string-match
        (concat "^\\(" riece-user-regexp
-              "\\) \\([^ ]+\\) \\([^ ]+\\) \\* :")
+              "\\) \\([^ ]+\\) \\([^ ]+\\) \\* :?")
        string)
       (let ((user (match-string 1 string))
            (name (substring string (match-end 0)))
@@ -142,7 +148,7 @@
 
 (defun riece-handle-312-message (prefix number name string)
   (if (string-match
-       (concat "^\\(" riece-user-regexp "\\) \\([^ ]+\\) :")
+       (concat "^\\(" riece-user-regexp "\\) \\([^ ]+\\) :?")
        string)
       (riece-insert-info
        (list riece-dialogue-buffer riece-others-buffer)
@@ -168,7 +174,7 @@
 
 (defun riece-handle-317-message (prefix number name string)
   (if (string-match
-       (concat "^\\(" riece-user-regexp "\\) \\([0-9]+\\) [^:]*:seconds")
+       (concat "^\\(" riece-user-regexp "\\) \\([0-9]+\\) ")
        string)
       (let ((user (match-string 1 string))
            (idle (match-string 2 string)))
@@ -184,7 +190,7 @@
          "\n")))))
 
 (defun riece-handle-319-message (prefix number name string)
-  (if (string-match (concat "^\\(" riece-user-regexp "\\) :") string)
+  (if (string-match (concat "^\\(" riece-user-regexp "\\) :?") string)
       (let ((user (match-string 1 string))
            (channels
             (mapconcat
@@ -212,7 +218,7 @@
          "\n")))))
 
 (defun riece-handle-351-message (prefix number name string)
-  (if (string-match "\\([^ ]+\\.[^ ]+\\) \\([^ ]+\\) :" string)
+  (if (string-match "\\([^ ]+\\.[^ ]+\\) \\([^ ]+\\) :?" string)
       (riece-insert-info
        (list riece-dialogue-buffer riece-others-buffer)
        (concat
@@ -226,7 +232,7 @@
 (defvar riece-353-users nil)
 (defun riece-handle-353-message (prefix number name string)
   "RPL_NAMREPLY        \"[=\*@] <channel> :[[@|+]<nick> [[@|+]<nick> [...]]]\"."
-  (if (string-match "^[=\*@] *\\([^ ]+\\) +:" string)
+  (if (string-match "^[=\*@] *\\([^ ]+\\) +:?" string)
       (let ((channel (match-string 1 string))
            (start 0)
            user)
@@ -264,7 +270,7 @@
            "\n"))))))
 
 (defun riece-handle-322-message (prefix number name string)
-  (if (string-match "^\\([^ ]+\\) \\([0-9]+\\) :" string)
+  (if (string-match "^\\([^ ]+\\) \\([0-9]+\\) :?" string)
       (let* ((channel (match-string 1 string))
             (visible (match-string 2 string))
             (topic (substring string (match-end 0))))
@@ -308,7 +314,7 @@
            "\n"))))))
 
 (defun riece-handle-set-topic (prefix number name string remove)
-  (if (string-match "^\\([^ ]+\\) :" string)
+  (if (string-match "^\\([^ ]+\\) :?" string)
       (let* ((channel (match-string 1 string))
             (message (substring string (match-end 0)))
             (channel-identity (riece-make-identity channel riece-server-name))
@@ -428,7 +434,7 @@
 
 (defun riece-handle-366-message (prefix number name string)
   "RPL_ENDOFNAMES \"<channel> :End of NAMES list\""
-  (if (string-match "^\\([^ ]+\\) +:" string)
+  (if (string-match "^\\([^ ]+\\) " string)
       (let ((channel (match-string 1 string)))
        (riece-naming-assert-channel-users (nreverse riece-353-users)
                                           channel)))