* riece-filter.el (riece-filter): Accept lines which ends with LF.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1704c85..9a595e3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2005-02-04  Daiki Ueno  <ueno@unixuser.org>
 
 2005-02-04  Daiki Ueno  <ueno@unixuser.org>
 

+       * riece-filter.el (riece-filter): Accept lines which ends with LF.
+

        * riece-300.el (riece-353-string): Renamed from riece-353-users.
        (riece-handle-353-message): Don't parse the reply.
        (riece-handle-366-message): Parse 353 replies here; count users.
        * riece-300.el (riece-353-string): Renamed from riece-353-users.
        (riece-handle-353-message): Don't parse the reply.
        (riece-handle-366-message): Parse 353 replies here; count users.

diff --git a/lisp/riece-filter.el b/lisp/riece-filter.el
index 685205a..65b252d 100644 (file)
--- a/lisp/riece-filter.el
+++ b/lisp/riece-filter.el
@@ -76,16 +76,16 @@
                 (setq riece-read-point (point))))
     (beginning-of-line)
     (while (and (not (eobp))
                 (setq riece-read-point (point))))
     (beginning-of-line)
     (while (and (not (eobp))

-               (looking-at ".*\r\n"))  ;the input line is not finished
+               (looking-at ".*\r?\n")) ;the input line is not finished

       (save-excursion
        (if (looking-at
       (save-excursion
        (if (looking-at

-            ":\\([^ ]+\\) +\\([0-5][0-9][0-9]\\) +\\([^ ]+\\) +\\(.*\\)\r\n")
+            ":\\([^ ]+\\) +\\([0-5][0-9][0-9]\\) +\\([^ ]+\\) +\\(.*\\)\r?\n")

            (riece-handle-numeric-reply
             (match-string 1)           ;prefix
             (string-to-number (match-string 2)) ;number
             (match-string 3)           ;name
             (match-string 4))          ;reply string
            (riece-handle-numeric-reply
             (match-string 1)           ;prefix
             (string-to-number (match-string 2)) ;number
             (match-string 3)           ;name
             (match-string 4))          ;reply string

-         (if (looking-at "\\(:\\([^ ]+\\) +\\)?\\([^ ]+\\) +\\(.*\\)\r\n")
+         (if (looking-at "\\(:\\([^ ]+\\) +\\)?\\([^ ]+\\) +\\(.*\\)\r?\n")

              (riece-handle-message
               (match-string 2)         ;optional prefix
               (match-string 3)         ;command
              (riece-handle-message
               (match-string 2)         ;optional prefix
               (match-string 3)         ;command