(easy-mmode-define-navigation): Avoid

[gnu-emacs] / lisp / emacs-lisp / tq.el

diff --git a/lisp/emacs-lisp/tq.el b/lisp/emacs-lisp/tq.el
index 5dc77a36f6ce5dc9f3984ffe446306efd8728dc4..917309e3b989dd39d73e0453cc620ab7f6daf6fb 100644 (file)
--- a/lisp/emacs-lisp/tq.el
+++ b/lisp/emacs-lisp/tq.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985, 1986, 1987, 1992 Free Software Foundation, Inc.
 
 ;; Author: Scott Draves <spot@cs.cmu.edu>
+;; Maintainer: FSF
 ;; Adapted-By: ESR
 ;; Keywords: extensions
 
@@ -19,20 +20,21 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; 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:
 
@@ -47,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
@@ -66,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)
@@ -86,10 +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."
-  (set-buffer (tq-buffer tq))
-  (goto-char (point-max))
-  (insert string)
-  (tq-process-buffer tq))
+  (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."
@@ -100,17 +102,20 @@ that's how we tell where the answer ends."
          (copy-to-buffer buf (point-min) (point-max))
          (delete-region (point-min) (point))
          (pop-to-buffer buf nil)
-         (error (concat "Spurious communication from process "
-                        (process-name (tq-process tq))
-                        ", see buffer " (buffer-name buf) ".")))
+         (error "Spurious communication from process %s, see buffer %s"
+                (process-name (tq-process tq))
+                (buffer-name buf)))
       (goto-char (point-min))
       (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)