X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/c0eae5b9bacfd8c561c60d41158c708f1c0c1f14..937640a621a4ce2e5e56eaecca37a2a28a584318:/lisp/emacs-lisp/tq.el

diff --git a/lisp/emacs-lisp/tq.el b/lisp/emacs-lisp/tq.el
index 0de2c48e63..f7db20859d 100644
--- a/lisp/emacs-lisp/tq.el
+++ b/lisp/emacs-lisp/tq.el
@@ -1,8 +1,9 @@
 ;;; tq.el --- utility to maintain a transaction queue
 
-;; Copyright (C) 1985, 1986, 1987, 1992 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1987, 1992, 2003 Free Software Foundation, Inc.
 
 ;; Author: Scott Draves <spot@cs.cmu.edu>
+;; Maintainer: FSF
 ;; Adapted-By: ESR
 ;; Keywords: extensions
 
@@ -24,16 +25,16 @@
 ;; Boston, MA 02111-1307, USA.
 
 ;;; Commentary:
- 
-;;; manages receiving a stream asynchronously, 
-;;; parsing it into transactions, and then calling
-;;; handler functions
 
-;;; Our basic structure is the queue/process/buffer triple.  Each entry
-;;; of the queue is a regexp/closure/function triple.  We buffer
-;;; bytes from the process until we see the regexp at the head of the
-;;; queue.  Then we call the function with the closure and the
-;;; collected bytes.
+;; manages receiving a stream asynchronously,
+;; parsing it into transactions, and then calling
+;; handler functions
+
+;; Our basic structure is the queue/process/buffer triple.  Each entry
+;; of the queue is a regexp/closure/function triple.  We buffer
+;; bytes from the process until we see the regexp at the head of the
+;; queue.  Then we call the function with the closure and the
+;; collected bytes.
 
 ;;; Code:
 
@@ -48,8 +49,8 @@ to a tcp server on another machine."
 			     (concat " tq-temp-"
 				     (process-name process)))))))
     (set-process-filter process
-			(`(lambda (proc string)
-			   (tq-filter  '(, tq) string))))
+			`(lambda (proc string)
+			   (tq-filter ',tq string)))
     tq))
 
 ;;; accessors
@@ -67,7 +68,7 @@ to a tcp server on another machine."
 (defun tq-queue-head-closure (tq) (car (cdr (car (tq-queue tq)))))
 (defun tq-queue-empty        (tq) (not (tq-queue tq)))
 (defun tq-queue-pop          (tq) (setcar tq (cdr (car tq))) (null (car tq)))
- 
+
 
 ;;; must add to queue before sending!
 (defun tq-enqueue (tq question regexp closure fn)
@@ -87,14 +88,10 @@ that's how we tell where the answer ends."
 
 (defun tq-filter (tq string)
   "Append STRING to the TQ's buffer; then process the new data."
-  (let ((old-buffer (current-buffer)))
-    (unwind-protect
-	(progn
-	  (set-buffer (tq-buffer tq))
-	  (goto-char (point-max))
-	  (insert string)
-	  (tq-process-buffer tq))
-      (set-buffer old-buffer))))
+  (with-current-buffer (tq-buffer tq)
+    (goto-char (point-max))
+    (insert string)
+    (tq-process-buffer tq)))
 
 (defun tq-process-buffer (tq)
   "Check TQ's buffer for the regexp at the head of the queue."
@@ -112,12 +109,16 @@ that's how we tell where the answer ends."
       (if (re-search-forward (tq-queue-head-regexp tq) nil t)
 	  (let ((answer (buffer-substring (point-min) (point))))
 	    (delete-region (point-min) (point))
-	    (funcall (tq-queue-head-fn tq)
-		     (tq-queue-head-closure tq)
-		     answer)
-	    (tq-queue-pop tq)
+	    (unwind-protect
+		(condition-case nil
+		    (funcall (tq-queue-head-fn tq)
+			     (tq-queue-head-closure tq)
+			     answer)
+		  (error nil))
+	      (tq-queue-pop tq))
 	    (tq-process-buffer tq))))))
 
 (provide 'tq)
 
+;;; arch-tag: 65dea08c-4edd-4cde-83a5-e8a15b993b79
 ;;; tq.el ends here