From: ueno <ueno>
Date: Mon, 7 Feb 2005 03:50:07 +0000 (+0000)
Subject: Undo the last change.
X-Git-Tag: riece-1_0_7b~2
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92a6575b120ef9641d5104cbfa3e10f332d990ec;p=elisp%2Friece.git

Undo the last change.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ee2c9ea..3a2a008 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,14 +1,3 @@
-2005-02-07  Daiki Ueno  <ueno@unixuser.org>
-
-	* riece-server.el (riece-reset-process-buffer): Reset
-	riece-filter-semaphore.
-	* riece-globals.el (riece-filter-semaphore): Define here.
-
-	* riece-filter.el (riece-get-semaphore): New function.
-	(riece-release-semaphore): New function.
-	(riece-filter-with-semaphore): New macro.
-	(riece-filter): Use it.
-
 2005-02-06  Daiki Ueno  <ueno@unixuser.org>
 
 	* riece-filter.el (riece-filter): Modified regexp.
diff --git a/lisp/riece-filter.el b/lisp/riece-filter.el
index 084c1dc..9182404 100644
--- a/lisp/riece-filter.el
+++ b/lisp/riece-filter.el
@@ -64,64 +64,43 @@
       (riece-ignore-errors (symbol-name after-hook)
 	(run-hook-with-args-until-success after-hook prefix string)))))
 
-;;; stolen (and renamed) from gnus-async.el.
-(defun riece-get-semaphore (semaphore)
-  "Wait until SEMAPHORE is released."
-  (while (/= (length (nconc (symbol-value semaphore) (list nil))) 2)
-    (sleep-for 0.1)))
-
-(defun riece-release-semaphore (semaphore)
-  "Release SEMAPHORE."
-  (setcdr (symbol-value semaphore) nil))
-
-(defmacro riece-filter-with-semaphore (&rest forms)
-  `(unwind-protect
-       (progn
-	 (riece-get-semaphore 'riece-filter-semaphore)
-	 ,@forms)
-     (riece-release-semaphore 'riece-filter-semaphore)))
-
-(put 'riece-filter-with-semaphore 'lisp-indent-function 0)
-(put 'riece-filter-with-semaphore 'edebug-form-spec '(body))
-
 (defsubst riece-chomp-string (string)
   (if (string-match "\r\\'" string)
       (substring string 0 (match-beginning 0))
     string))
 
 (defun riece-filter (process input)
-  (riece-filter-with-semaphore
-   (save-excursion
-     (set-buffer (process-buffer process))
-     (goto-char riece-read-point)
-     (unless riece-debug
-       (delete-region (riece-line-beginning-position) (point-min))
-       (setq riece-read-point (point)))
-     (insert input)
-     (goto-char (prog1 riece-read-point
-		  (setq riece-read-point (point))))
-     (beginning-of-line)
-     (while (and (not (eobp))
-		 (looking-at ".*\n"))	;the input line is not finished
-       (save-excursion
-	 (if (looking-at
-	      ":\\([^ ]+\\) +\\([0-5][0-9][0-9]\\) +\\([^ ]+\\) +\\(.*\\)\n")
-	     (riece-handle-numeric-reply
-	      (match-string 1)		;prefix
-	      (string-to-number (match-string 2)) ;number
-	      (match-string 3)		;name
-	      (riece-chomp-string (match-string 4))) ;reply string
-	   (if (looking-at "\\(:\\([^ ]+\\) +\\)?\\([^ ]+\\) +\\(.*\\)\n")
-	       (riece-handle-message
-		(match-string 2)	;optional prefix
-		(match-string 3)	;command
-		(riece-chomp-string (match-string 4))) ;params & trailing
-	     (if riece-debug
-		 (message "Weird message from server: %s"
-			  (buffer-substring (point) (progn
-						      (end-of-line)
-						      (point))))))))
-       (forward-line)))))
+  (save-excursion
+    (set-buffer (process-buffer process))
+    (goto-char riece-read-point)
+    (unless riece-debug
+      (delete-region (riece-line-beginning-position) (point-min))
+      (setq riece-read-point (point)))
+    (insert input)
+    (goto-char (prog1 riece-read-point
+		 (setq riece-read-point (point))))
+    (beginning-of-line)
+    (while (and (not (eobp))
+		(looking-at ".*\n"))	;the input line is not finished
+      (save-excursion
+	(if (looking-at
+	     ":\\([^ ]+\\) +\\([0-5][0-9][0-9]\\) +\\([^ ]+\\) +\\(.*\\)\n")
+	    (riece-handle-numeric-reply
+	     (match-string 1)		;prefix
+	     (string-to-number (match-string 2)) ;number
+	     (match-string 3)		;name
+	     (riece-chomp-string (match-string 4))) ;reply string
+	  (if (looking-at "\\(:\\([^ ]+\\) +\\)?\\([^ ]+\\) +\\(.*\\)\n")
+	      (riece-handle-message
+	       (match-string 2)		;optional prefix
+	       (match-string 3)		;command
+	       (riece-chomp-string (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"))
diff --git a/lisp/riece-globals.el b/lisp/riece-globals.el
index dbbd8d2..a4addfa 100644
--- a/lisp/riece-globals.el
+++ b/lisp/riece-globals.el
@@ -123,9 +123,6 @@ Local to the server buffers.")
 (defvar riece-coding-system nil
   "Coding system for process I/O.
 Local to the server buffers.")
-(defvar riece-filter-semaphore nil
-  "Semaphore for riece-filter.
-Local to the server buffers.")
 
 ;;; Variables local to the channel buffers:
 (defvar riece-freeze nil
diff --git a/lisp/riece-server.el b/lisp/riece-server.el
index 2323ddd..39c1610 100644
--- a/lisp/riece-server.el
+++ b/lisp/riece-server.el
@@ -262,8 +262,6 @@ the `riece-server-keyword-map' variable."
     (make-local-variable 'riece-obarray)
     (setq riece-obarray (make-vector riece-obarray-size 0))
     (make-local-variable 'riece-coding-system)
-    (make-local-variable 'riece-filter-semaphore)
-    (setq riece-filter-semaphore '(nil))
     (buffer-disable-undo)
     (erase-buffer)))