(tq-filter): Add unwind-protect and save-match-data.

diff --git a/lisp/emacs-lisp/tq.el b/lisp/emacs-lisp/tq.el
index 8654e76fd59b2b4dc8740a587837760c72c56705..e0524bb6e19cb405e0b6fcff2c36a724d02bb71b 100644 (file)
--- a/lisp/emacs-lisp/tq.el
+++ b/lisp/emacs-lisp/tq.el
@@ -87,10 +87,14 @@ 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))
+  (let ((old-buffer (current-buffer)))
+    (unwind-protect
+       (save-match-data
+         (set-buffer (tq-buffer tq))
+         (goto-char (point-max))
+         (insert string)
+         (tq-process-buffer tq))
+      (set-buffer old-buffer))))
 
 (defun tq-process-buffer (tq)
   "Check TQ's buffer for the regexp at the head of the queue."