From: ueno <ueno>
Date: Sun, 18 Jul 2004 20:48:35 +0000 (+0000)
Subject: * riece-filter.el (riece-filter): Simplified.
X-Git-Tag: riece-1_0_2~8
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=0598d01938f5f07347854af8b42f5788c15d2d37;p=elisp%2Friece.git

* riece-filter.el (riece-filter): Simplified.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 489bc86..e7cb0bc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2004-07-18  Daiki Ueno  <ueno@unixuser.org>
 
+	* riece-filter.el (riece-filter): Simplified.
+
 	* riece-server.el (riece-server-keyword-map): Add :protocol.
 
 	* riece-handle.el (riece-300): Require 'riece-000, 'riece-200,
diff --git a/lisp/riece-filter.el b/lisp/riece-filter.el
index 5dc9cf6..6c5f44c 100644
--- a/lisp/riece-filter.el
+++ b/lisp/riece-filter.el
@@ -87,29 +87,27 @@
     (goto-char (prog1 riece-read-point
 		 (setq riece-read-point (point))))
     (beginning-of-line)
-    (catch 'contiguous
-      (while (not (eobp))
-	(save-excursion
-	  (if (looking-at
-	       ":\\([^ ]+\\) +\\([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
-	    (if (looking-at "\\(:\\([^ ]+\\) +\\)?\\([^ ]+\\) +\\(.*\\)\r\n")
-		(riece-handle-message
-		 (match-string 2)	;optional prefix
-		 (match-string 3)	;command
-		 (match-string 4))	;params & trailing
-	      (if (looking-at ".*\r\n")
-		  (if riece-debug
-		      (message "Weird message from server: %s"
-			       (buffer-substring (point) (progn
-							   (end-of-line)
-							   (point)))))
-		(throw 'contiguous nil)))))
-	(forward-line)))))
+    (while (and (not (eobp))
+		(looking-at ".*\r\n"))	;the input line is not finished
+      (save-excursion
+	(if (looking-at
+	     ":\\([^ ]+\\) +\\([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
+	  (if (looking-at "\\(:\\([^ ]+\\) +\\)?\\([^ ]+\\) +\\(.*\\)\r\n")
+	      (riece-handle-message
+	       (match-string 2)	;optional prefix
+	       (match-string 3)	;command
+	       (match-string 4))	;params & trailing
+	    (if riece-debug
+		(message "Weird message from server: %s"
+			 (buffer-substring (point) (progn
+						     (end-of-line)
+						     (point))))))))
+      (forward-line))))
 
 (eval-when-compile
   (autoload 'riece-exit "riece"))