[Emacs-diffs] /srv/bzr/emacs/trunk r107286: Kill jobs that we remove from the queue

[Lars Ingebrigtsen]

------------------------------------------------------------
revno: 107286
committer: Lars Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Tue 2012-02-14 19:43:21 +0100
message:
  Kill jobs that we remove from the queue
  
  * url-queue.el (url-queue-kill-job): Refactored out code.
  (url-queue-remove-jobs-from-host): Use it to kill jobs that are in
  flight.
modified:
  lisp/url/ChangeLog
  lisp/url/url-queue.el

=== modified file 'lisp/url/ChangeLog'
--- a/lisp/url/ChangeLog        2012-02-14 13:18:05 +0000
+++ b/lisp/url/ChangeLog        2012-02-14 18:43:21 +0000
@@ -1,3 +1,9 @@
+2012-02-14  Lars Ingebrigtsen  <address@hidden>
+
+       * url-queue.el (url-queue-kill-job): Refactored out code.
+       (url-queue-remove-jobs-from-host): Use it to kill jobs that are in
+       flight.
+
 2012-02-14  Teodor Zlatanov  <address@hidden>
 
        * url-future.el: Minor doc update.

=== modified file 'lisp/url/url-queue.el'
--- a/lisp/url/url-queue.el     2012-02-10 17:22:09 +0000
+++ b/lisp/url/url-queue.el     2012-02-14 18:43:21 +0000
@@ -127,6 +127,7 @@
                   host)
        (push job jobs)))
     (dolist (job jobs)
+      (url-queue-kill-job job)
       (setq url-queue (delq job url-queue)))))
 
 (defun url-queue-start-retrieve (job)
@@ -146,14 +147,17 @@
                    url-queue-timeout))
        (push job dead-jobs)))
     (dolist (job dead-jobs)
-      (when (bufferp (url-queue-buffer job))
-       (while (get-buffer-process (url-queue-buffer job))
-         (ignore-errors
-           (delete-process (get-buffer-process (url-queue-buffer job)))))
-       (ignore-errors
-         (kill-buffer (url-queue-buffer job))))
+      (url-queue-kill-job job)
       (setq url-queue (delq job url-queue)))))
 
+(defun url-queue-kill-job (job)
+  (when (bufferp (url-queue-buffer job))
+    (while (get-buffer-process (url-queue-buffer job))
+      (ignore-errors
+       (delete-process (get-buffer-process (url-queue-buffer job)))))
+    (ignore-errors
+      (kill-buffer (url-queue-buffer job)))))
+
 (provide 'url-queue)
 
 ;;; url-queue.el ends here