[Emacs-diffs] master 95d2250 1/3: Tweak tq queue processing

[Lars Ingebrigtsen]

branch: master
commit 95d2250bcf762296ec88e78d88f0c3b310b119ae
Author: Andreas Politz <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    Tweak tq queue processing
    
    * lisp/emacs-lisp/tq.el (tq-process-buffer): Pop the queue before
    calling the function because the function may add new entries to
    the queue (bug#19016).  Also report errors.
---
 lisp/emacs-lisp/tq.el | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/lisp/emacs-lisp/tq.el b/lisp/emacs-lisp/tq.el
index 4249305..a8c7e89 100644
--- a/lisp/emacs-lisp/tq.el
+++ b/lisp/emacs-lisp/tq.el
@@ -153,15 +153,18 @@ This produces more reliable results with some processes."
                     (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))))
+             (let ((answer (buffer-substring (point-min) (point)))
+                    (fn (tq-queue-head-fn tq))
+                    (closure (tq-queue-head-closure tq)))
                (delete-region (point-min) (point))
-               (unwind-protect
-                   (condition-case nil
-                       (funcall (tq-queue-head-fn tq)
-                                (tq-queue-head-closure tq)
-                                answer)
-                     (error nil))
-                 (tq-queue-pop tq))
+                ;; Pop the queue before calling the function because
+                ;; the function may add new functions to the head of
+                ;; the queue.
+               (tq-queue-pop tq)
+                (condition-case err
+                    (funcall fn closure answer)
+                  (error (message "Error while processing tq callback: %s"
+                                  (error-message-string err))))
                (tq-process-buffer tq))))))))
 
 (provide 'tq)